Template difference with tests #60
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ TemplateOperations/*.nb | |
| TemplateGeneration/*.nb | ||
| .DS_Store | ||
| .idea/* | ||
| *.iml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| (* ::Package:: *) | ||
|
|
||
| BeginPackage["CATemplates`TemplateOperations`Difference`Common`", { | ||
| "CATemplates`Basic`", | ||
| "CATemplates`CATemplate`"}]; | ||
|
|
||
|
|
||
| DualEquationSystem::usage = "bl2"; | ||
| DifferenceReplacementRules::usage = " | ||
| DifferenceReplacementRules[template1_List, template2_List]: Takes two templates template1 and template2, and returns the replacement rules that could be applied to template1 or template2 in order to find the diference between then. Returns {} if there is no possible diference template or if they are both templates are the same. | ||
| DifferenceReplacementRules[template1_List, template2_List, modulus_Integer]: Takes two templates template1 and template2, and returns the replacement rules that could be applied to template1 or template2 in order to find the diference between then. Returns {} if there is no possible diference template or if they are both templates are the same. Assumes both templates are modular. | ||
| "; | ||
|
|
||
|
|
||
| Begin["`Private`"]; | ||
|
|
||
| EquationSystem[template1_List,template2_List]:= | ||
| Equal @@ # & /@ Transpose[{template1, template2}]; | ||
|
|
||
| DualEquationSystem[template1_List, template2_List] := | ||
| Module[{notTemplate2, equationSystem, cleanEquationSystem, dualEquationSystem, dualEquationSystemResult}, | ||
| equationSystem = EquationSystem[template1, template2];(*Make a equation System*) | ||
| cleanEquationSystem = Select[equationSystem, !TrueQ[#]&];(*Remove tautologies*) | ||
| dualEquationSystem = Map[Part[#, 1] == 1 - (Part[#, 2])&, cleanEquationSystem];(*Apply Not to all variables*) | ||
| dualEquationSystemResult = Or @@ (# & /@ dualEquationSystem) (*Change boolean operator AND to OR*) | ||
| ]; | ||
|
|
||
| DifferenceReplacementRules[template1_List, template2_List, modulus_Integer : 0] := | ||
|
There was a problem hiding this comment. If you receive full templates instead of their |
||
| Module[{ | ||
| templateVars = SortBy[Union[Flatten[{TemplateCoreVars[template1], TemplateCoreVars[template2]}, 1]], | ||
| FromDigits[StringDrop[SymbolName[#], 1]] &], | ||
| dualEquationSystem | ||
| }, | ||
| dualEquationSystem = DualEquationSystem[template1, template2]; | ||
| If[dualEquationSystem =!= False, | ||
| If[modulus === 0, | ||
| Union[Quiet[Solve[DualEquationSystem[template1, template2], templateVars]]], | ||
| Union[Quiet[Solve[DualEquationSystem[template1, template2], Reverse[templateVars], Modulus -> modulus]]] | ||
| ], {} | ||
| ] | ||
| ]; | ||
|
There was a problem hiding this comment. Is this |
||
|
|
||
| End[]; | ||
| EndPackage[]; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| (* ::Package:: *) | ||
|
|
||
| BeginPackage[ | ||
| "CATemplates`TemplateOperations`Difference`ExceptionTemplates`", | ||
| { | ||
| "CATemplates`Basic`", | ||
| "CATemplates`CATemplate`" | ||
| } | ||
| ]; | ||
|
|
||
| PossibleInvalidSubsets::usage = "bl1"; | ||
| SubstitutionRangeVar::usage = "bl1"; | ||
| ExpandVar::usage = "bl1"; | ||
| ExpandVars::usage = "bl1"; | ||
| InvalidSubSets::usage = "bl1"; | ||
|
|
||
| ExceptionTemplates::usage= "ExceptionTemplates[t_List, k_Integer:2, r_Real:1] generate all the templates with variable assignments that make the template t with k colors and r range invalid."; | ||
|
|
||
| Begin["`Private`"]; | ||
| PossibleInvalidSubsets[intemplate_Association] := PossibleInvalidSubsets[intemplate[["rawList"]]]; | ||
| PossibleInvalidSubsets[intemplate_List] := Select[intemplate, (Depth[#] > 1) &]; | ||
|
|
||
| SubstitutionRangeVar[var_, k_Integer : 2] := Range[0, k^Length[TemplateCoreVars[{var}]] - 1]; | ||
|
There was a problem hiding this comment. What do you think about renaming this to |
||
|
|
||
| ExpandVar[var_, i_Integer] := Module[{variables = TemplateCoreVars[{var}], substitution, transformationRules, result}, | ||
|
There was a problem hiding this comment. Is this related to template expasion? If not, please use another name so we don't get confused |
||
| substitution = Reverse[IntegerDigits[i, 2, Length[variables]]]; | ||
| transformationRules = MapThread[#1 -> #2 &, {variables, substitution}]; | ||
| result = var /. transformationRules; | ||
| If[result >= 2|| result < 0, transformationRules, (##) &[]] | ||
| ]; | ||
| ExpandVars[vars_, range_] := | ||
| Module[{result}, result = Map[ExpandVar[vars, #] &, range]; | ||
|
There was a problem hiding this comment. prefer |
||
| If[result == {}, Nothing, result]]; | ||
|
|
||
| InvalidSubSets[intemplate_List] := | ||
| Module[{possibleInvalids = PossibleInvalidSubsets[intemplate], | ||
|
|
||
| result}, | ||
| result = | ||
| MapThread[ | ||
| ExpandVars, {possibleInvalids, | ||
| SubstitutionRangeVar[#, 2] & /@ possibleInvalids}]; | ||
| If[result == {}, {}, Flatten[result, 1]]]; | ||
|
|
||
| InvalidSubSets[intemplate_Association] := Module[{possibleInvalids = PossibleInvalidSubsets[intemplate]}, | ||
| MapThread[ExpandVars, {possibleInvalids, SubstitutionRangeVar[#, intemplate[["k"]]]& /@ possibleInvalids}] | ||
| ]; | ||
|
There was a problem hiding this comment. close |
||
|
|
||
| ExceptionTemplates[intemplate_Association] := | ||
| Module[{exceptionTemplates}, | ||
| exceptionTemplates = ExceptionTemplates[intemplate[["core"]], intemplate[["k"]], intemplate[["r"]]]; | ||
| BuildTemplate[intemplate[["k"]], intemplate[["r"]], #] & /@ exceptionTemplates | ||
| ]; | ||
|
|
||
| ExceptionTemplates[intemplate_List] := | ||
| ExceptionTemplates[intemplate, 2, 1.0]; | ||
|
|
||
| ExceptionTemplates[intemplate_List, k_ /; k === 2, r_Real : 1.0] := | ||
| Module[{invalidSubsSets, filteredInvalidSubsSets, baseTemplate = OldBaseTemplate[k, r], result = {}}, | ||
| invalidSubsSets = Union[ | ||
| SortBy[InvalidSubSets[intemplate], Total] | ||
| ]; | ||
| If[invalidSubsSets =!= {}, | ||
| filteredInvalidSubsSets = MinimizedRuleSets[invalidSubsSets]; | ||
| result = (baseTemplate /. #) & /@ filteredInvalidSubsSets; | ||
| ]; | ||
| result | ||
| ]; | ||
|
|
||
| ExceptionTemplates[intemplate_List, k_Integer:2, r_Real : 1.0] := | ||
|
There was a problem hiding this comment. This is probably shadowing the previous definition of |
||
| MapThread[If[#2 === _, #1, #2]&, {OldBaseTemplate[k, r], #}]& /@ Union[(If[NumberQ[#], #, _]& /@ #)& /@ ((OldBaseTemplate[k, r] /. #[[1]])& /@ Cases[{#[[2]], #[[1]] /. #[[2]]}& /@ Flatten[Outer[List, {#[[1]]}, #[[2]], 1]& /@ ({#[[2]], MapThread[#1 -> #2&, {#[[1]], #[[2]]}]& /@ #[[1]]}& /@ ({First@Outer[List, {#[[1]]}, #[[2]], 1], #[[3]]}& /@ ({#[[1]], Tuples[Range[0, k - 1], Length[#[[1]]]], #[[2]]}& /@ ({TemplateCoreVars[{#}], #}& /@ Select[intemplate, (Depth[#] > 1)&])))), 2], {_, x_ /; \[Not]MemberQ[Range[0, k - 1], x]}])] | ||
|
|
||
| End[]; | ||
| EndPackage[]; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| (* ::Package:: *) | ||
|
|
||
| Get["CATemplates`TemplateOperations`Difference`Common`"]; | ||
|
|
||
| Get["CATemplates`TemplateOperations`Difference`RawDifference`"] | ||
|
|
||
| Get["CATemplates`TemplateOperations`Difference`TemplateDifference`"] | ||
|
|
||
| Get["CATemplates`TemplateOperations`Difference`ExceptionTemplates`"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| (* ::Package:: *) | ||
|
|
||
| BeginPackage[ | ||
| "CATemplates`TemplateOperations`Difference`RawDifference`", | ||
| { | ||
| "CATemplates`Basic`", | ||
| "CATemplates`CATemplate`", | ||
| "CATemplates`TemplateOperations`Intersection`TemplateIntersection`", | ||
| "CATemplates`TemplateOperations`Difference`Common`", | ||
| "CATemplates`TemplateOperations`Difference`ExceptionTemplates`"} | ||
| ]; | ||
|
|
||
|
|
||
| RawDifference::usage = "bl1"; | ||
| RawDifferenceOld::usage = "bl1"; | ||
| RawDifferenceDirect::usage = "bl1"; | ||
| RawDifferenceDirectOld::usage = "bl1"; | ||
|
|
||
|
|
||
| Begin["`Private`"]; | ||
|
|
||
| RawDifferenceOld[template1_List, template2_List, radius_ : 1.0] := | ||
|
|
||
| Module[{templateIntersection, exceptionTemplates, templateDifferenceP1, templateDifferenceP2, templateDifference, replacementRules, replacementRulesFinal}, | ||
| templateIntersection = Flatten[RawIntersection[template1, template2]]; | ||
| If[!ValidTemplateCoreQ[templateIntersection] || templateIntersection === {}, | ||
| templateDifference = {template1};, | ||
| replacementRules = DifferenceReplacementRules[template1, templateIntersection]; | ||
| replacementRulesFinal = Select[replacementRules, FreeQ[#, _Rational] &]; | ||
|
|
||
| If[replacementRulesFinal == {}, templateDifference = {};, | ||
| templateDifferenceP1 = template1 /. replacementRulesFinal; | ||
| exceptionTemplates = ExceptionTemplates[templateIntersection, 2, radius]; | ||
| templateDifferenceP2 = RawIntersection[template1, #] & /@ exceptionTemplates; | ||
| templateDifference = Join[templateDifferenceP1, templateDifferenceP2]; | ||
| ] | ||
| ]; | ||
| templateDifference | ||
| ]; | ||
|
|
||
| RawDifferenceDirectOld[template1_List, template2_List, radius_ : 1.0] := | ||
|
|
||
| Module[{templateIntersection, exceptionTemplates, templateDifferenceP1, templateDifferenceP2, templateDifference, replacementRules, replacementRulesFinal}, | ||
| templateIntersection = Flatten[RawIntersection[template1, template2]]; | ||
| If[!ValidTemplateCoreQ[templateIntersection] || templateIntersection === {}, | ||
| templateDifference = {template1};, | ||
| replacementRules = DifferenceReplacementRules[template1, template2]; | ||
| replacementRulesFinal = Select[replacementRules, FreeQ[#, _Rational] &]; | ||
| replacementRulesFinal = Select[replacementRules, ContainsOnly[TemplateCoreVars[#], TemplateCoreVars[template1]]&]; | ||
|
|
||
| If[replacementRulesFinal == {}, | ||
| templateDifferenceP1 = {};, | ||
| templateDifferenceP1 = template1 /. replacementRulesFinal; | ||
| ]; | ||
| exceptionTemplates = ExceptionTemplates[template2, 2, radius]; | ||
| templateDifferenceP2 = RawIntersection[template1, #] & /@ exceptionTemplates; | ||
| templateDifference = Join[templateDifferenceP1, templateDifferenceP2]; | ||
| (*Print[templateDifferenceP1];*) | ||
| (*Print[templateDifferenceP2];*) | ||
| ]; | ||
| templateDifference | ||
| ]; | ||
|
|
||
| RawDifference[template1A_Association, template2A_Association, radius_ : 1.0] := | ||
|
There was a problem hiding this comment. Can you try to extract some of this code to functions with meaningful names? |
||
| Module[{template1, template2, templateIntersection, template1And2HasIntersection, templateIntersectionA, exceptionTemplates, templateDifferenceP1, templateDifferenceP2, templateDifference, replacementRules, replacementRulesFinal}, | ||
| template1 = template1A[["core"]]; | ||
| template2 = template2A[["core"]]; | ||
| templateIntersectionA = TemplateIntersection[template1A,template2A]; | ||
| templateIntersection = templateIntersectionA[["core"]]; | ||
| template1And2HasIntersection = !(!ValidTemplateCoreQ[templateIntersection] || templateIntersection === {}); | ||
| If[!template1And2HasIntersection, | ||
| templateDifference = {template1};, | ||
| replacementRules = DifferenceReplacementRules[template1, templateIntersection]; | ||
| replacementRulesFinal = Select[replacementRules, FreeQ[#, _Rational] &]; | ||
| replacementRulesFinal = Select[replacementRules, ContainsOnly[TemplateCoreVars[#], TemplateCoreVars[template1]]&]; | ||
|
|
||
| If[replacementRulesFinal == {}, | ||
| templateDifferenceP1 = {};, | ||
| templateDifferenceP1 = template1 /. replacementRulesFinal; | ||
| ]; | ||
| exceptionTemplates = ExceptionTemplates[templateIntersectionA]; | ||
| templateDifferenceP2 = TemplateIntersection[template1A, #] & /@ exceptionTemplates; | ||
| templateDifferenceP2 = #[["core"]] & /@templateDifferenceP2; | ||
| templateDifference = Join[templateDifferenceP1, templateDifferenceP2]; | ||
| ]; | ||
| templateDifference | ||
| ]; | ||
|
|
||
|
|
||
| RawDifferenceDirect[template1A_Association, template2A_Association, radius_ : 1.0] := | ||
|
There was a problem hiding this comment. What is the difference between |
||
| Module[{template1, template2, templateIntersection, template1And2HasIntersection, templateIntersectionA, exceptionTemplates, templateDifferenceP1, templateDifferenceP2, templateDifference, replacementRules, replacementRulesFinal}, | ||
| template1 = template1A[["core"]]; | ||
| template2 = template2A[["core"]]; | ||
| templateIntersectionA = TemplateIntersection[template1A,template2A]; | ||
| templateIntersection = templateIntersectionA[["core"]]; | ||
| template1And2HasIntersection = !(!ValidTemplateCoreQ[templateIntersection] || templateIntersection === {}); | ||
| If[!template1And2HasIntersection, | ||
| templateDifference = {template1};, | ||
| replacementRules = DifferenceReplacementRules[template1, template2]; | ||
| replacementRulesFinal = Select[replacementRules, FreeQ[#, _Rational] &]; | ||
| replacementRulesFinal = Select[replacementRules, ContainsOnly[TemplateCoreVars[#], TemplateCoreVars[template1]]&]; | ||
|
|
||
| If[replacementRulesFinal == {}, | ||
| templateDifferenceP1 = {};, | ||
| templateDifferenceP1 = template1 /. replacementRulesFinal; | ||
| ]; | ||
| exceptionTemplates = ExceptionTemplates[template2A]; | ||
| templateDifferenceP2 = TemplateIntersection[template1A, #] & /@ exceptionTemplates; | ||
| templateDifferenceP2 = #[["core"]] & /@templateDifferenceP2; | ||
| templateDifference = Join[templateDifferenceP1, templateDifferenceP2]; | ||
| ]; | ||
| templateDifference | ||
| ]; | ||
|
|
||
|
|
||
|
|
||
| End[]; | ||
| EndPackage[]; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Avoid adding functions to
Basic.#59 removes this namespace and we are gonna have conflicts.
If these functions are only used on
ExceptionTemplates, you can leave them there.If you think these could be useful to other functions in the future, you can create a new namespace for them.