Changeset 16183 for branches

Timestamp:

09/25/18 11:28:51 (6 years ago)

Author:

hmaislin

Message:

#2929: Adapted PGE Go code to work as dll

Location:

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/problems

Files:

• data.go (modified) (2 diffs)
• problem.go (modified) (1 diff)
• treeparams.go (modified) (1 diff)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/problems/data.go

@@ -8 +8 @@
   "math/rand"
   "os"
+  "C"
+  "unsafe"
 )
 
@@ -126 +128 @@
 }
 
+func (trainData *PointSet) InitTrainData(indepNames []string, depndNames []string, matrix unsafe.Pointer, nEntries int) {
+  trainData.indepNames = indepNames  //First line in .trn file
+  trainData.numDim = len(trainData.indepNames)
+  trainData.depndNames = depndNames //Second line in .trn file
+  fmt.Printf("Var Names = %v | %v\n", trainData.depndNames, trainData.indepNames)
+  var nClum int = len(indepNames) + len(depndNames)
+
+  for i := 0; i < nEntries; i++ {
+    var pnt Point 
+    for j := 0; j < len(trainData.indepNames); j++ {
+      elemNr := i * nClum + j
+      item := (*float64) (unsafe.Pointer( uintptr(unsafe.Pointer(matrix)) + unsafe.Sizeof(float64(0)) * uintptr(elemNr) ))
+      pnt.indep = append(pnt.indep, *item)
+    }
+
+    for j := len(trainData.indepNames); j < (len(trainData.indepNames) + len(trainData.depndNames)); j++ {
+      elemNr := i * nClum + j
+      item := (*float64) (unsafe.Pointer( uintptr(unsafe.Pointer(matrix)) + unsafe.Sizeof(float64(0)) * uintptr(elemNr) ))
+      pnt.depnd = append(pnt.depnd, *item )
+    }
+
+    if len(pnt.indep) > 0 {
+      trainData.dataPoints = append(trainData.dataPoints, pnt)
+    }
+  }
+  fmt.Printf("Num Points: %v\n", len(trainData.dataPoints))
+}
+
 func (d *PointSet) ReadPointSet(filename string) {
   ftotal, err := os.OpenFile(filename, os.O_RDONLY, 0)

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/problems/problem.go

@@ -166 +166 @@
   return list[0:i]
 }
+
+
+func (ep *ExprProblem) CreatePS(Name string, MaxIter int, HitRatio float64, SearchVar int, ProblemTypeString string) {  //IndepNames []string, DepndNames []string, SysNames []string
+  ep.SearchType = ProblemTypeFromString(ProblemTypeString)
+  ep.Name = Name
+  
+  ep.TrainFns = append(ep.TrainFns, "dummy")
+  ep.TestFns = append(ep.TestFns, "dummy")
+    
+  ep.MaxIter = MaxIter
+  ep.HitRatio = HitRatio
+  ep.SearchVar = SearchVar
+}

branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/problems/treeparams.go

@@ -297 +297 @@
   tp.TmpMinSize, tp.TmpMinDepth = tp.MinSize, tp.MinDepth
 }
+
+
+func (TP *TreeParams) CreateTreeParams(Roots string, Nodes string, NonTrig string, Leafs string, UsableVars []int, MaxSize int, MinSize int, MaxDepth int, MinDepth int) {
+  TP.RootsS = strings.Fields(Roots)
+  TP.RootsT, TP.Roots = fillExprStuff(TP.RootsS)
+  
+  TP.NodesS = strings.Fields(Nodes)
+  TP.NodesT, TP.Nodes = fillExprStuff(TP.NodesS)
+  
+  TP.NonTrigS = strings.Fields(NonTrig)
+  TP.NonTrigT, TP.NonTrig = fillExprStuff(TP.NonTrigS)
+  
+  TP.LeafsS = strings.Fields(Leafs)
+  TP.LeafsT, TP.Leafs = fillExprStuff(TP.LeafsS)
+
+  TP.UsableVars = UsableVars
+
+  TP.MaxSize = MaxSize
+  TP.MinSize = MinSize
+  TP.MaxDepth = MaxDepth
+  TP.MinDepth = MinDepth
+}