Changeset 16323 for branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Intervalnterpreter.cs

Timestamp:

11/23/18 15:19:39 (5 years ago)

Author:

chaider

Message:

#2966: Added Interval class and Interpreter class.

File:

• branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Intervalnterpreter.cs (copied) (copied from branches/2956_apriori_knowledge/HeuristicLab.Algorithms.DataAnalysis.KnowledgeIntegration/3.4/Interpreter/SymbolicDataAnalysisIntervalArithmeticInterpreter.cs) (6 diffs)

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

@@ -14 +14 @@
   [StorableClass]
   [Item("SymbolicDataAnalysisIntervalArithmeticInterpreter", "Interpreter for interval arithmetic within symbolic regression.")]
-  public class SymbolicDataAnalysisIntervalArithmeticInterpreter : ParameterizedNamedItem{
+  public class IntervalInterpreter : ParameterizedNamedItem{
     private const string EvaluatedSolutionsParameterName = "EvaluatedSolutions";
     public IFixedValueParameter<IntValue> EvaluatedSolutionsParameter {
@@ -27 +27 @@
     public void ClearState() { }
 
-    protected SymbolicDataAnalysisIntervalArithmeticInterpreter(bool deserializing) : base(deserializing) { }
-
-    protected SymbolicDataAnalysisIntervalArithmeticInterpreter(SymbolicDataAnalysisIntervalArithmeticInterpreter original,
+    protected IntervalInterpreter(bool deserializing) : base(deserializing) { }
+
+    protected IntervalInterpreter(IntervalInterpreter original,
         Cloner cloner)
         : base(original, cloner) { }
 
-    public SymbolicDataAnalysisIntervalArithmeticInterpreter()
+    public IntervalInterpreter()
         : base("SymbolicDataAnalysisIntervalArithmeticInterpreter", "Interpreter for interval arithmetic within symbolic regression.") { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicDataAnalysisIntervalArithmeticInterpreter(this, cloner);
+      return new IntervalInterpreter(this, cloner);
     }
 
@@ -79 +79 @@
     }
 
-    //private static InterpreterState PrepareInterpreterState(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows, Dictionary<string, Interval> customIntervals = null) {
-    //  Instruction[] code = SymbolicExpressionTreeCompiler.Compile(tree, OpCodes.MapSymbolToOpCode);
-    //  int necessaryArgStackSize = 0;
-    //  foreach (Instruction instr in code) {
-    //    if (instr.opCode == OpCodes.Variable) {
-    //      var variableTreeNode = (VariableTreeNode)instr.dynamicNode;
-    //      IList<double> values = new List<double>();
-
-    //      if (customIntervals != null && customIntervals.ContainsKey(variableTreeNode.VariableName)) {
-    //        instr.data = customIntervals[variableTreeNode.VariableName];
-    //      } else {
-    //        foreach (var rowEnum in rows) {
-    //          values.Add(dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName)[rowEnum]);
-    //        }
-    //        instr.data = new Interval(values.Min(), values.Max());
-    //      }
-    //      //instr.data = dataset.GetReadOnlyDoubleValues(variableTreeNode.VariableName);
-    //    } else if (instr.opCode == OpCodes.FactorVariable) {
-    //      var factorTreeNode = instr.dynamicNode as FactorVariableTreeNode;
-    //      instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName);
-    //    } else if (instr.opCode == OpCodes.BinaryFactorVariable) {
-    //      var factorTreeNode = instr.dynamicNode as BinaryFactorVariableTreeNode;
-    //      instr.data = dataset.GetReadOnlyStringValues(factorTreeNode.VariableName);
-    //    } else if (instr.opCode == OpCodes.LagVariable) {
-    //      var laggedVariableTreeNode = (LaggedVariableTreeNode)instr.dynamicNode;
-    //      instr.data = dataset.GetReadOnlyDoubleValues(laggedVariableTreeNode.VariableName);
-    //    } else if (instr.opCode == OpCodes.VariableCondition) {
-    //      var variableConditionTreeNode = (VariableConditionTreeNode)instr.dynamicNode;
-    //      instr.data = dataset.GetReadOnlyDoubleValues(variableConditionTreeNode.VariableName);
-    //    } else if (instr.opCode == OpCodes.Call) {
-    //      necessaryArgStackSize += instr.nArguments + 1;
-    //    }
-    //  }
-    //  return new InterpreterState(code, necessaryArgStackSize);
-    //}
-
     private Interval Evaluate(InterpreterState state, Dictionary<ISymbolicExpressionTreeNode, Interval> intervals) {
       Instruction currentInstr = state.NextInstruction();
@@ -186 +150 @@
             return s;
           }
+        case OpCodes.Square: {
+            var s = Interval.Square(Evaluate(state, intervals));
+            intervals.Add(currentInstr.dynamicNode, s);
+            return s;
+          }
         case OpCodes.Root: {
             var s = Evaluate(state, intervals);
@@ -191 +160 @@
               s = Interval.Root(s, Evaluate(state, intervals));
             }
+            intervals.Add(currentInstr.dynamicNode, s);
+            return s;
+          }
+        case OpCodes.SquareRoot: {
+            var s = Interval.SquareRoot(Evaluate(state, intervals));
             intervals.Add(currentInstr.dynamicNode, s);
             return s;
@@ -213 +187 @@
       EvaluatedSolutions = 0;
     }
-
-    //public InterpreterState GetInstructions(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows, Dictionary<string, Interval> customIntervals = null) {
-    //  var state = PrepareInterpreterState(tree, dataset, rows, customIntervals);
-    //  var x = Evaluate(dataset, state);
-    //  state.Reset();
-
-    //  return state;
-    //}
-
-    // public Interval GetSymbolicExressionTreeInterval(tree,variableIntervals)
-    //public Interval GetSymbolicExressionTreeInterval(tree,Dataset,intervals = null)
 
     public Interval GetSymbolicExressionTreeIntervals(ISymbolicExpressionTree tree, IEnumerable<int> rows, out Dictionary<ISymbolicExpressionTreeNode, Interval> intervals) {