Changeset 16212 for branches

Timestamp:

10/06/18 08:10:08 (6 years ago)

Author:

gkronber

Message:

#2929 several fixes

File:

• branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs (modified) (4 diffs)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs

@@ -285 +285 @@
 
 
-      int nTrainData = Problem.ProblemData.TrainingPartition.Size;
-      int nTestData = Problem.ProblemData.TestPartition.Size;
 
       //Constants
       int sortType = 0;
       string problemTypeString = "benchmark";
-      int NumProcs = 12;
+      int numProc = 12;
       string problemName = Problem.ProblemData.Name;
 
-
-      int indepLen = Problem.ProblemData.AllowedInputVariables.Count();
 
       var problemData = Problem.ProblemData;
       var variables = problemData.AllowedInputVariables.Concat(new string[] { problemData.TargetVariable });
       // no idea why the following are IntPtr, this should not be necessary for marshalling, it should be ok to just send the double[,]
-      IntPtr trainData = GetData(problemData.Dataset, variables, problemData.TrainingIndices);
-      IntPtr testData = GetData(problemData.Dataset, variables, problemData.TestIndices);
-
-      int numberOfUseableVariables = problemData.AllowedInputVariables.Count();
+      int nTrainData;
+      int nTestData;
+      IntPtr trainData = GetData(problemData.Dataset, variables, problemData.TrainingIndices, out nTrainData);
+      IntPtr testData = GetData(problemData.Dataset, variables, problemData.TestIndices, out nTestData);
+
       var inputVariableNames = string.Join(" ", problemData.AllowedInputVariables); 
       // TODO: does this work when input variables contain spaces?
@@ -325 +322 @@
 
 
+
       AddTestData(cIndepNames, cDependentNames, testData, nTestData);
 
       AddTrainData(cIndepNames, cDependentNames, trainData, nTrainData);
 
-      IntPtr cUseableVars = GetUsableVars(problemData.AllowedInputVariables.Count());
+      int numberOfUseableVariables = problemData.AllowedInputVariables.Count();
+      IntPtr cUseableVars = GetUsableVars(numberOfUseableVariables);
 
       InitSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, cInitMethod, cGrowMethod, sortType);
 
+      // cUsableVars: list of indices into dependent variables
       InitTreeParams(cRoots, cNodes, cNonTrig, cLeafs, cUseableVars, numberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
 
-      InitProblem(cName, MaxIterations, HitRatio, SearchVar, cProblemTypeString, NumProcs);
+      // SearchVar: list of indices into independent variables (0 for first index)
+      InitProblem(cName, MaxIterations, HitRatio, SearchVar, cProblemTypeString, numProc);
 
       var curItersItem = new IntValue();
@@ -408 +409 @@
     }
 
-    private static IntPtr GetData(IDataset ds, IEnumerable<string> variableNames, IEnumerable<int> rows) {
+    private static IntPtr GetData(IDataset ds, IEnumerable<string> variableNames, IEnumerable<int> rows, out int n) {
 
       var dim = variableNames.Count();
@@ -421 +422 @@
         r++;
       }
-      
+
+      n = val.Length;
 
       // TODO: seems strange to marshal this explicitly, we can just send the data over to PGE