Changeset 16231 for branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/plug/pge.go
- Timestamp:
- 10/17/18 04:47:09 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2929_PrioritizedGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.PGE/3.3/go-code/go-pge/plug/pge.go
r16230 r16231 32 32 var probDepndNames []string 33 33 34 var stepResult []*pge.PeelResult35 var lastStepRes *p ge.PeelResult34 var stepResult probs.ExprReportArray 35 var lastStepRes *probs.ExprReport 36 36 var resultNr int 37 37 38 38 var nCurrentCoeff int 39 39 var nMaxCoeff int 40 41 var nLastResults int 40 42 41 43 //export InitSearch … … 48 50 testDatasN = 0 49 51 trainDatasN = 0 50 52 nLastResults = 0 51 53 cps.CreateDS(maxGen, pgeRptEpoch, pgeRptCount, pgeArchiveCap, peelCnt, evalrCount, zeroEpsilon, goInitMethod, goGrowMethod, sortType) 52 54 … … 79 81 probDepndNames = goDepndNames 80 82 81 trainData.InitTrainData F(goIndepNames, goDepndNames, matrix, nEntries)83 trainData.InitTrainData(goIndepNames, goDepndNames, matrix, nEntries) 82 84 83 85 trainDatas[trainDatasN] = trainData … … 93 95 goDepndNames := strings.Split(C.GoString(depndNames), " ") 94 96 95 testData.InitT estDataF(goIndepNames, goDepndNames, matrix, nEntries)97 testData.InitTrainData(goIndepNames, goDepndNames, matrix, nEntries) 96 98 testDatas[testDatasN] = testData 97 99 testDatasN++ … … 135 137 epcomm.Rpts = make(chan *probs.ExprReportArray, 64) 136 138 epcomm.Gen = make(chan [2]int, 64) 139 137 140 fmt.Printf("6\n") 138 141 … … 195 198 *testscore = 0 196 199 197 if resultNr < cps.GetPeelCount(){200 if resultNr < len(stepResult) && stepResult != nil { 198 201 elem := stepResult[resultNr] 199 202 resultNr++ 200 203 lastStepRes = elem 204 *bestlen1 = len(stepResult) 201 205 if(elem != nil) { 202 if elem.Nobestpush {203 *nobestpush = 1;204 } else {205 if elem.BestNewMinErr {206 *bestnewminerr = 1207 }208 *testscore = elem.TestScore 209 *ncoeff = len(elem.Coeff )206 //if elem.Nobestpush { 207 // *nobestpush = 1; 208 //} else { 209 // if elem.BestNewMinErr { 210 *bestnewminerr = int(elem.TestError()) 211 // } 212 *testscore = elem.TestScore() 213 *ncoeff = len(elem.Coeff()) 210 214 nCurrentCoeff = 0 211 nMaxCoeff = len(elem.Coeff )212 *bestlen1 =elem.Bestlen1213 *bestlen2 = elem.Bestlen2214 return C.CString(elem.Expr e.String())215 }215 nMaxCoeff = len(elem.Coeff()) 216 //*bestlen1 = 0 //elem.Bestlen1 217 *bestlen2 = 0 //elem.Bestlen2 218 return C.CString(elem.Expr().String()) 219 //} 216 220 } 217 221 } … … 226 230 //*item = elem.Coeff[i] 227 231 228 res = lastStepRes.Coeff[nCurrentCoeff] 232 coeffs := lastStepRes.Coeff() 233 res = coeffs[nCurrentCoeff] 229 234 } 230 235 nCurrentCoeff++ … … 233 238 234 239 //export StepW 235 func StepW() {240 func StepW() int { 236 241 resultNr = 0 237 stepResult = cps.SingleStep() 242 stepResult = nil 243 nRes := cps.Step() 244 245 resu, ok := <-epcomm.Rpts 246 247 //_ = ok 248 249 resultNr = nLastResults 250 251 nNew := 0 252 if ok && resu != nil { 253 stepResult = *resu 254 nNew = nRes - nLastResults 255 nLastResults = nRes 256 } 257 258 return nNew 238 259 } 239 260
Note: See TracChangeset
for help on using the changeset viewer.