Changeset 6878 for branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs

Timestamp:

10/05/11 21:55:55 (13 years ago)

Author:

abeham

Message:

#1614

• updated branch from trunk

Location:

branches/GeneralizedQAP

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs (modified) (2 diffs)

branches/GeneralizedQAP

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs

branches/GeneralizedQAP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs

@@ -73 +73 @@
       var rows = problemData.TrainingIndizes;
       var estimatedValues = model.Interpreter.GetSymbolicExpressionTreeValues(model.SymbolicExpressionTree, dataset, rows);
-      var targetValues = dataset.GetEnumeratedVariableValues(targetVariable, rows);
+      var targetValues = dataset.GetDoubleValues(targetVariable, rows);
       double alpha;
       double beta;
@@ -86 +86 @@
       if (startNode.GetSubtree(0).Symbol is Addition) {
         var addNode = startNode.GetSubtree(0);
-        if (addNode.SubtreesCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) {
+        if (addNode.SubtreeCount == 2 && addNode.GetSubtree(0).Symbol is Multiplication && addNode.GetSubtree(1).Symbol is Constant) {
           alphaTreeNode = addNode.GetSubtree(1) as ConstantTreeNode;
           var mulNode = addNode.GetSubtree(0);
-          if (mulNode.SubtreesCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) {
+          if (mulNode.SubtreeCount == 2 && mulNode.GetSubtree(1).Symbol is Constant) {
             betaTreeNode = mulNode.GetSubtree(1) as ConstantTreeNode;
           }

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ -4 +4 @@
 obj
 *.vs10x
+Plugin.cs