Changeset 10395 for branches/HeuristicLab.Problems.GPDL/Examples

Timestamp:

01/25/14 23:20:15 (11 years ago)

Author:

gkronber

Message:

#2026 performance improvement for symbolic regression example

File:

• branches/HeuristicLab.Problems.GPDL/Examples/symbreg Koza.txt (modified) (4 diffs)

branches/HeuristicLab.Problems.GPDL/Examples/symbreg Koza.txt

@@ -4 +4 @@
   double[] y;
   int[] rows;
-  string[] variableNames;
+  int[] variables;
   double[] randomConsts;
-  
-  Dictionary<string,int> nameToCol;
-  
-  double GetValue(double[,] data, string varName, int row) {
-    if(nameToCol == null) {
-      /* init mapping */
-      nameToCol = new Dictionary<string, int>();
-      for(int i=0; i<variableNames.Length; i++) {
-        nameToCol[variableNames[i]] = i;
-      }
-    }
-    return x[row, nameToCol[varName]];
-  }
 
   double RSquared(IEnumerable<double> xs, IEnumerable<double> ys) {
@@ -56 +43 @@
   // generate 500 cases of poly-10 benchmark function
   int n = 500;
-  variableNames = new string[] {"x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10" };
+  variables = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   var rand = new System.Random(31415);
   x = new double[n, 10];
@@ -91 +78 @@
   .
 
-  Var<<out string varName>> 
+  Var<<out int variable>> 
     CONSTRAINTS
-      varName IN SET << variableNames >>
+      variable IN SET << variables >>
   .
 
@@ -100 +87 @@
     RPB<<row, out val>> .
 
-  RPB<<int row, out double val>> =                         LOCAL << string varName; >>
+  RPB<<int row, out double val>> =                         LOCAL << int variable; >>
     Addition<<row, out val>>
     | Subtraction<<row, out val>>
     | Division<<row, out val>>
     | Multiplication<<row, out val>>
-    | Var<<out varName>>                                   SEM << val = GetValue(x, varName, row); >>
+    | Var<<out variable>>                                  SEM << val = x[row, variable]; >>
     /* | ERC<<out val>>  */
   .