Changeset 16620 for branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/PGE.cs

Timestamp:

02/26/19 00:20:12 (5 years ago)

Author:

hmaislin

Message:

#2929: Reorganized folder structure for make script, removed explicit marshalling, erased go-side logging

File:

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

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

@@ -25 +25 @@
 
     [DllImport("go-pge.dll", EntryPoint = "addTestData", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void AddTestData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
+    public static extern void AddTestData([MarshalAs(UnmanagedType.AnsiBStr)] string indepNames, [MarshalAs(UnmanagedType.AnsiBStr)] string depndNames, double[] matrix, int nEntries);
 
     [DllImport("go-pge.dll", EntryPoint = "addTrainData", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void AddTrainData(IntPtr indepNames, IntPtr depndNames, IntPtr matrix, int nEntries);
+    public static extern void AddTrainData([MarshalAs(UnmanagedType.AnsiBStr)] string indepNames, [MarshalAs(UnmanagedType.AnsiBStr)] string depndNames, double[] matrix, int nEntries);
 
     [DllImport("go-pge.dll", EntryPoint = "initSearch", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void InitSearch(int maxGen, int pgeRptEpoch, int pgeRptCount, int pgeArchiveCap, int peelCnt, int evalrCount, double zeroEpsilon, IntPtr initMethod, IntPtr growMethod, int sortType);
+    public static extern void InitSearch(int maxGen, int pgeRptEpoch, int pgeRptCount, int pgeArchiveCap, int peelCnt, int evalrCount, double zeroEpsilon, [MarshalAs(UnmanagedType.AnsiBStr)] string initMethod, [MarshalAs(UnmanagedType.AnsiBStr)] string growMethod, int sortType);
 
     [DllImport("go-pge.dll", EntryPoint = "initTreeParams", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void InitTreeParams(IntPtr roots, IntPtr nodes, IntPtr nonTrig, IntPtr leafs, int numUsableVars, int maxSize, int minSize, int maxDepth, int minDepth);
+    public static extern void InitTreeParams([MarshalAs(UnmanagedType.AnsiBStr)] string roots, [MarshalAs(UnmanagedType.AnsiBStr)] string nodes, [MarshalAs(UnmanagedType.AnsiBStr)] string nonTrig, [MarshalAs(UnmanagedType.AnsiBStr)] string leafs, int numUsableVars, int maxSize, int minSize, int maxDepth, int minDepth);
 
     [DllImport("go-pge.dll", EntryPoint = "initProblem", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    public static extern void InitProblem(IntPtr name, int maxIter, double hitRatio, int searchVar, IntPtr ProblemTypeString, int numProcs);
+    public static extern void InitProblem([MarshalAs(UnmanagedType.AnsiBStr)] string name, int maxIter, double hitRatio, int searchVar, [MarshalAs(UnmanagedType.AnsiBStr)] string ProblemTypeString, int numProcs);
 
     [DllImport("go-pge.dll", EntryPoint = "stepW", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
@@ -303 +303 @@
 
       //Constants
-      int sortType = 0; // TODO what's sort type?
+      int sortType = 0; // TODO what's sort type? //
+      //1 = PESORT_PARETO_TRN_ERR
+      //0 = PESORT_PARETO_TST_ERR
+
       string problemTypeString = "benchmark";
       int numProc = 12;
@@ -312 +315 @@
       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[,]
-      int nTrainData;
-      int nTestData;
-      IntPtr trainData = GetData(problemData.Dataset, variables, problemData.TrainingIndices, out nTrainData);
-      IntPtr testData = GetData(problemData.Dataset, variables, problemData.TestIndices, out nTestData);
-
-      nTrainData = Problem.ProblemData.TrainingPartition.Size;
-      nTestData = Problem.ProblemData.TestPartition.Size;
+      
+      double[] trainData = GetData(problemData.Dataset, variables, problemData.TrainingIndices);
+      double[] testData = GetData(problemData.Dataset, variables, problemData.TestIndices);
+
+      int nTrainData = Problem.ProblemData.TrainingPartition.Size;
+      int nTestData = Problem.ProblemData.TestPartition.Size;
 
       if (problemData.AllowedInputVariables.Any(iv => iv.Contains(" ")))
@@ -325 +327 @@
       var inputVariableNames = string.Join(" ", problemData.AllowedInputVariables);
 
-      IntPtr cIndepNames = Marshal.StringToHGlobalAnsi(inputVariableNames);
-      IntPtr cDependentNames = Marshal.StringToHGlobalAnsi(problemData.TargetVariable);
-      // Dependent- and Independentnames are the variables from the test/train data, e.g. from "Korns_02.trn" indep: x y z v w  dep: f(xs)
-
-      IntPtr cInitMethod = Marshal.StringToHGlobalAnsi(InitMethod);
-      IntPtr cGrowMethod = Marshal.StringToHGlobalAnsi(GrowMethod);
-
-      IntPtr cRoots = Marshal.StringToHGlobalAnsi(Roots);
-      IntPtr cNodes = Marshal.StringToHGlobalAnsi(Nodes);
-      IntPtr cNonTrig = Marshal.StringToHGlobalAnsi(NonTrig);
-      IntPtr cLeafs = Marshal.StringToHGlobalAnsi(Leafs);
-
-      IntPtr cName = Marshal.StringToHGlobalAnsi(problemName);
-      IntPtr cProblemTypeString = Marshal.StringToHGlobalAnsi(problemTypeString);
-
-
-      AddTestData(cIndepNames, cDependentNames, testData, nTestData);
-      AddTrainData(cIndepNames, cDependentNames, trainData, nTrainData);
+      AddTestData(inputVariableNames, problemData.TargetVariable, testData, nTestData);
+      AddTrainData(inputVariableNames, problemData.TargetVariable, trainData, nTrainData);
 
       int numberOfUseableVariables = problemData.AllowedInputVariables.Count();
 
-      InitSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, cInitMethod, cGrowMethod, sortType);
+      InitSearch(MaxGen, PgeRptEpoch, PgeRptCount, PgeArchiveCap, PeelCnt, EvalrCount, ZeroEpsilon, InitMethod, GrowMethod, sortType);
 
       // cUsableVars: list of indices into independent variables
-      InitTreeParams(cRoots, cNodes, cNonTrig, cLeafs, numberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
-
-      InitProblem(cName, MaxIterations, HitRatio, 
+      InitTreeParams(Roots, Nodes, NonTrig, Leafs, numberOfUseableVariables, MaxSize, MinSize, MaxDepth, MinDepth);
+
+      InitProblem(Name, MaxIterations, HitRatio, 
         searchVar: 0,  // SearchVar: index of dependent variables (this is always zero because we only have one target variable)
-        ProblemTypeString: cProblemTypeString, numProcs: numProc);
+        ProblemTypeString: problemTypeString, numProcs: numProc);
 
       var bestTestScore = int.MaxValue;
@@ -387 +373 @@
         if (cancellationToken.IsCancellationRequested) break;
       }
-
-      Marshal.FreeHGlobal(trainData);
-      Marshal.FreeHGlobal(testData);
-
-      Marshal.FreeHGlobal(cIndepNames);
-      Marshal.FreeHGlobal(cDependentNames);
-
-      Marshal.FreeHGlobal(cInitMethod);
-      Marshal.FreeHGlobal(cGrowMethod);
-
-      Marshal.FreeHGlobal(cRoots);
-      Marshal.FreeHGlobal(cNodes);
-      Marshal.FreeHGlobal(cNonTrig);
-      Marshal.FreeHGlobal(cLeafs);
-
-      Marshal.FreeHGlobal(cName);
-      Marshal.FreeHGlobal(cProblemTypeString);
 
       // Results.Add(new Result("Execution time", new TimeSpanValue(this.ExecutionTime)));
@@ -444 +413 @@
     }
 
-    private static IntPtr GetData(IDataset ds, IEnumerable<string> variableNames, IEnumerable<int> rows, out int n) {
-
+    private static double[] GetData(IDataset ds, IEnumerable<string> variableNames, IEnumerable<int> rows) {
       var dim = variableNames.Count();
       double[] val = new double[rows.Count() * dim];
@@ -457 +425 @@
         r++;
       }
-
-      n = val.Length;
-
-      // TODO: seems strange to marshal this explicitly, we can just send the data over to PGE
-      IntPtr data = Marshal.AllocHGlobal(sizeof(double) * val.Length);
-      Marshal.Copy(val, 0, data, val.Length);
-
-      return data;
+      return val;
     }
   }