Changeset 16403

Timestamp:

12/19/18 10:56:29 (5 years ago)

Author:

chaider

Message:

#2966 Changed variable names

File:

• branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (5 diffs)

branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -70 +70 @@
 
     public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows = null) {
-      var intervalBoundaries = DatasetUtil.GetVariableRanges(dataset, rows);
-      return GetSymbolicExressionTreeIntervals(tree, intervalBoundaries);
+      var variableRanges = DatasetUtil.GetVariableRanges(dataset, rows);
+      return GetSymbolicExressionTreeIntervals(tree, variableRanges);
     }
 
     public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree, IDataset dataset,
       out Dictionary<ISymbolicExpressionTreeNode, Interval> intervals, IEnumerable<int> rows = null) {
-      var intervalBoundaries = DatasetUtil.GetVariableRanges(dataset, rows);
-      return GetSymbolicExressionTreeIntervals(tree, intervalBoundaries, out intervals);
-    }
-
-    public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree, Dictionary<string, Interval> customIntervals) {
+      var variableRanges = DatasetUtil.GetVariableRanges(dataset, rows);
+      return GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals);
+    }
+
+    public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree, Dictionary<string, Interval> customIntervalsForVariables) {
       lock (syncRoot) {
         EvaluatedSolutions++;
       }
       int instructionCount = 0;
-      var instructions = PrepareInterpreterState(tree, customIntervals);
+      var instructions = PrepareInterpreterState(tree, customIntervalsForVariables);
       var outputInterval = Evaluate(instructions, ref instructionCount);
 
@@ -93 +93 @@
 
     public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree,
-      Dictionary<string, Interval> customIntervals, out Dictionary<ISymbolicExpressionTreeNode, Interval> intervals) {
+      Dictionary<string, Interval> customIntervalsForVariables, out Dictionary<ISymbolicExpressionTreeNode, Interval> intervals) {
       lock (syncRoot) {
         EvaluatedSolutions++;
@@ -99 +99 @@
       int instructionCount = 0;
       intervals = new Dictionary<ISymbolicExpressionTreeNode, Interval>();
-      var instructions = PrepareInterpreterState(tree, customIntervals);
+      var instructions = PrepareInterpreterState(tree, customIntervalsForVariables);
       var outputInterval = Evaluate(instructions, ref instructionCount, intervals);
 
@@ -106 +106 @@
 
 
-    private static Instruction[] PrepareInterpreterState(ISymbolicExpressionTree tree, Dictionary<string, Interval> customIntervals) {
+    private static Instruction[] PrepareInterpreterState(ISymbolicExpressionTree tree, Dictionary<string, Interval> customIntervalsForVariables) {
       Instruction[] code = SymbolicExpressionTreeCompiler.Compile(tree, OpCodes.MapSymbolToOpCode);
 
-      if (customIntervals == null)
-        throw new ArgumentException("No interval ranges are present!", nameof(customIntervals));
+      if (customIntervalsForVariables == null)
+        throw new ArgumentException("No interval ranges are present!", nameof(customIntervalsForVariables));
 
       foreach (var variable in tree.IterateNodesPrefix().OfType<VariableTreeNode>().Select(n => n.VariableName).Distinct()) {
-        if (!customIntervals.ContainsKey(variable)) throw new InvalidOperationException($"No ranges for variable {variable} is present");
+        if (!customIntervalsForVariables.ContainsKey(variable)) throw new InvalidOperationException($"No ranges for variable {variable} is present");
       }
 
       foreach (Instruction instr in code.Where(i => i.opCode == OpCodes.Variable)) {
         var variableTreeNode = (VariableTreeNode)instr.dynamicNode;
-        instr.data = customIntervals[variableTreeNode.VariableName];
+        instr.data = customIntervalsForVariables[variableTreeNode.VariableName];
       }
       return code;
@@ -130 +130 @@
         //Variables, Constants, ...
         case OpCodes.Variable: {
-            if (intervals != null)
-              intervals.Add(currentInstr.dynamicNode, (Interval)currentInstr.data);
             var variableTreeNode = (VariableTreeNode)currentInstr.dynamicNode;
             var variableWeight = variableTreeNode.Weight;
-
-            return Interval.Multiply((Interval)currentInstr.data, new Interval(variableWeight, variableWeight));
+            var varibleWeightInterval = new Interval(variableWeight, variableWeight);
+
+            result = Interval.Multiply((Interval)currentInstr.data, varibleWeightInterval);
+            break;
           }
         case OpCodes.Constant: {
             var constTreeNode = (ConstantTreeNode)currentInstr.dynamicNode;
-            var inter = new Interval(constTreeNode.Value, constTreeNode.Value);
-            if (intervals != null)
-              intervals.Add(currentInstr.dynamicNode, inter);
-            return inter;
+            result = new Interval(constTreeNode.Value, constTreeNode.Value);
+            break;
           }
         //Elementary arithmetic rules