Changeset 3409 for trunk

Timestamp:

04/19/10 10:18:15 (15 years ago)

Author:

gkronber

Message:

Worked on ADF aware evaluation for symbolic regression problems #938 (Data types and operators for regression problems)

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Instruction.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeCompiler.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs (modified) (3 diffs)
• HeuristicLab/Files.x86.txt (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Instruction.cs

@@ -35 +35 @@
     Div,
     Call,
+    Arg,
     Values,
     Dynamic

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -47 +47 @@
     }
 
-    public SymbolicExpressionTreeNode ResultProducingExpression {
-      get { return root.SubTrees[0].SubTrees[0]; }
-    }
-
     public int Size {
       get {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeCompiler.cs

@@ -37 +37 @@
       {typeof(Division), CodeSymbol.Div},
       {typeof(InvokeFunction), CodeSymbol.Call},
+      {typeof(Argument), CodeSymbol.Arg},
       //{typeof(Values), CodeSymbol.Values}
     };
@@ -45 +46 @@
       entryPoint.Clear();
       // compile main body
-      code.AddRange(Compile(tree.ResultProducingExpression));
+      code.AddRange(Compile(tree.Root.SubTrees[0]));
       // compile branches
       var functionBranches = from node in tree.IterateNodesPrefix()
@@ -67 +68 @@
             var invokeNode = (InvokeFunctionTreeNode)node;
             instr.iArg0 = entryPoint[invokeNode.Symbol.FunctionName];
+          } else if (instr.symbol == CodeSymbol.Arg) {
+            var argNode = (ArgumentTreeNode)node;
+            instr.iArg0 = (short)argNode.Symbol.ArgumentIndex;
           }
         } else {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

@@ -141 +141 @@
       SymbolicExpressionTreeCreator creator = new ProbabilisticTreeCreator();
       var evaluator = new SymbolicRegressionMeanSquaredErrorEvaluator();
-      var grammar = new ArithmeticExpressionGrammar();
+      var grammar = new GlobalSymbolicExpressionGrammar(new ArithmeticExpressionGrammar());
       Parameters.Add(new ValueParameter<BoolValue>("Maximization", "Set to false as the error of the regression model should be minimized.", new BoolValue(false)));
       Parameters.Add(new ValueParameter<SymbolicExpressionTreeCreator>("SolutionCreator", "The operator which should be used to create new symbolic regression solutions.", creator));

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionEvaluator.cs

@@ -44 +44 @@
         this.row = row;
         pc = 0;
+        arguments.Clear();
         var estimatedValue = Evaluate();
         if (double.IsNaN(estimatedValue) || double.IsInfinity(estimatedValue)) yield return 0.0;
@@ -50 +51 @@
     }
 
+    private List<double> arguments = new List<double>();
     public double Evaluate() {
       var currentInstr = code[pc++];
@@ -81 +83 @@
             return p;
           }
+        case CodeSymbol.Call: {
+            // save current arguments
+            var oldArgs = new List<double>(arguments);
+            arguments.Clear();
+            // evaluate sub-trees
+            for (int i = 0; i < currentInstr.nArguments; i++) {
+              arguments.Add(Evaluate());
+            }
+            // save the pc
+            int nextPc = pc;
+            // set pc to start of function  
+            pc = currentInstr.iArg0;
+            // evaluate the function
+            double v = Evaluate();
+            // restore the pc => evaluation will continue at point after my subtrees  
+            pc = nextPc;
+            // restore arguments
+            arguments = oldArgs;
+            return v;
+          }
+        case CodeSymbol.Arg: {
+            return arguments[currentInstr.iArg0];
+          }
         case CodeSymbol.Dynamic: {
             var variableTreeNode = currentInstr.dynamicNode as VariableTreeNode;

trunk/sources/HeuristicLab/Files.x86.txt

@@ -2 +2 @@
 ; This file contains a list of all x86 specific files
 
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceca35.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlcecompact35.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceer35EN.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceme35.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceoledb35.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceqp35.dll
-HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlcese35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceca35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlcecompact35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceer35EN.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceme35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceoledb35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlceqp35.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLServerCompact\3.5.1.0\x86\sqlcese35.dll
 
-HeuristicLab.ExtLibs\HeuristicLab.SQLite\1.0.65.0\x86\System.Data.SQLite.dll
+;HeuristicLab.ExtLibs\HeuristicLab.SQLite\1.0.65.0\x86\System.Data.SQLite.dll