Changeset 10399 for branches

Timestamp:

01/26/14 12:50:13 (10 years ago)

Author:

gkronber

Message:

#2026 performance improvement for the second symbolic regression example

File:

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

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

@@ -4 +4 @@
   double[,] x;
   double[] y;
-  string[] variableNames;
+  int[] variables;
   int[] rows;
-  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) {
@@ -55 +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();
   x = new double[n, 10];
@@ -86 +74 @@
       val IN RANGE <<-10.0>> .. <<10.0>>
   .
-  Var<<out string varName, out double weight>>  
+  Var<<out int variable, out double weight>>  
     CONSTRAINTS
-      varName IN SET <<variableNames>>
+      variable IN SET <<variables>>
       weight IN RANGE <<-10.0>> .. <<10.0>>
   .
@@ -96 +84 @@
     RPB<<row, out val>> .
     
-  RPB<<int row, out double val>> =                         LOCAL << string varName; double w; >> 
+  RPB<<int row, out double val>> =                         LOCAL << int variable; double w; >> 
     Addition<<row, out val>>
     | Subtraction<<row, out val>>
     | Division<<row, out val>>
     | Multiplication<<row, out val>>                       
-    | Var<<out varName, out w>>                            SEM << val = w * GetValue(x, varName, row); >>
+    | Var<<out variable, out w>>                            SEM << val = w * x[row, variable]; >>
     | Const<<out val>>
   .