Changeset 17760

Timestamp:

09/24/20 16:14:08 (4 years ago)

Author:

chaider

Message:

#3073

• Split only variables occuring more than once in the model
• Fixed returning interval from splitting method

File:

• branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (8 diffs)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -160 +160 @@
       Interval outputInterval;
       if (UseIntervalSplitting) {
-        var variables = tree.IterateNodesPrefix().OfType<VariableTreeNode>().Select(x => x.VariableName).Distinct()
-                            .ToList();
-        var containsDependencyProblem = ContainsVariableMultipleTimes(tree);
+        //var variables = tree.IterateNodesPrefix().OfType<VariableTreeNode>().Select(x => x.VariableName).Distinct()
+        //                    .ToList();
+        var containsDependencyProblem = ContainsVariableMultipleTimes(tree, out var variables);
 
         if (containsDependencyProblem) {
@@ -171 +171 @@
           //outputInterval = EvaluateRecursive(instructions, intervals, writeableVariableRanges, variables, MinSplittingWidth, MaxSplittingDepth,
           //  ref currIndex, ref currDepth, tree);
-          outputInterval = EvaluateWithSplitting(instructions, intervals, writeableVariableRanges);
+          outputInterval = EvaluateWithSplitting(instructions, intervals, writeableVariableRanges, variables);
         } else {
           var instructionCount = 0;
@@ -221 +221 @@
     public static Interval EvaluateWithSplitting(Instruction[] instructions,
                                                  IDictionary<ISymbolicExpressionTreeNode, Interval> nodeIntervals,
-                                                 IDictionary<string, Interval> variableIntervals) {
+                                                 IDictionary<string, Interval> variableIntervals, List<string> multipleOccurenceVariables) {
       var savedIntervals = variableIntervals.ToDictionary(entry => entry.Key, entry => entry.Value);
-      var min = FindBound(instructions, nodeIntervals, variableIntervals, minimization: true);
-      var max = FindBound(instructions, nodeIntervals, savedIntervals, minimization: false);
+      var min = FindBound(instructions, nodeIntervals, variableIntervals, multipleOccurenceVariables, minimization: true);
+      var max = FindBound(instructions, nodeIntervals, savedIntervals, multipleOccurenceVariables, minimization: false);
 
       return new Interval(min, max);
@@ -232 +232 @@
     private static double FindBound(Instruction[] instructions,
                                     IDictionary<ISymbolicExpressionTreeNode, Interval> nodeIntervals,
-                                    IDictionary<string, Interval> variableIntervals, bool minimization = true) {
+                                    IDictionary<string, Interval> variableIntervals, List<string> multipleOccurenceVariables, bool minimization = true) {
       SortedSet<BoxBound> prioQ = new SortedSet<BoxBound>();
 
@@ -241 +241 @@
       // the order of keys in a dictionary is guaranteed to be the same order as values in a dictionary
       // https://docs.microsoft.com/en-us/dotnet/api/system.collections.idictionary.keys?view=netcore-3.1#remarks
-      var box = variableIntervals.Values;
+      //var box = variableIntervals.Values;
+      //Box only contains intervals from multiple occurence variables
+      var box = multipleOccurenceVariables.Select(k => variableIntervals[k]);
       if (minimization) {
         prioQ.Add(new BoxBound(box, interval.LowerBound));
@@ -256 +258 @@
 
         foreach (var newBox in newBoxes) {
+          //var intervalEnum = newBox.GetEnumerator();
+          //var keyEnum = readonlyRanges.Keys.GetEnumerator();
+          //while (intervalEnum.MoveNext() & keyEnum.MoveNext()) {
+          //  variableIntervals[keyEnum.Current] = intervalEnum.Current;
+          //}
+          //Set the splitted variables
           var intervalEnum = newBox.GetEnumerator();
-          var keyEnum = readonlyRanges.Keys.GetEnumerator();
-          while (intervalEnum.MoveNext() & keyEnum.MoveNext()) {
-            variableIntervals[keyEnum.Current] = intervalEnum.Current;
+          foreach (var key in multipleOccurenceVariables) {
+            intervalEnum.MoveNext();
+            variableIntervals[key] = intervalEnum.Current;
           }
 
@@ -266 +274 @@
             new ReadOnlyDictionary<string, Interval>(variableIntervals));
           if (minimization) {
-            prioQ.Add(new BoxBound(newBox, interval.LowerBound));
+            prioQ.Add(new BoxBound(newBox, res.LowerBound));
           } else {
-            prioQ.Add(new BoxBound(newBox, -interval.UpperBound));
+            prioQ.Add(new BoxBound(newBox, -res.UpperBound));
           }
         }
@@ -539 +547 @@
     }
 
-    private static bool ContainsVariableMultipleTimes(ISymbolicExpressionTree tree) {
+    private static bool ContainsVariableMultipleTimes(ISymbolicExpressionTree tree, out List<String> variables) {
+      variables = new List<string>();
       var varlist = tree.IterateNodesPrefix().OfType<VariableTreeNode>().GroupBy(x => x.VariableName);
+      foreach (var group in varlist) {
+        if (group.Count() > 1) {
+          variables.Add(group.Key);
+        }
+      }
+
       return varlist.Any(group => group.Count() > 1);
     }