Context Navigation

SingleObjective

Timestamp:

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

Author:

abeham

Message:

#1614

Location:

branches/GeneralizedQAP

Files:

Property svn:ignore

-                      old
+                      new
+*.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
 …
 _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

Property svn:mergeinfo changed

/branches/GP.Grammar.Editor (added)	merged: 6284-6285,6296,6299,6335,6337,6377,6379,6387,6403,6409,6415,6493-6494,6497,6618,6620,6622,6626,6647,6675,6782,6784,6786,6795
/branches/Restructure trunk solution (added)	merged: 6828
/branches/Trunk (added)	merged: 6829,6831-6833,6842-6848,6850,6865
/trunk/sources	merged: 6686-6687,6690-6695,6697,6705,6709,6718-6720,6728-6729,6732,6735,6738-6742,6745-6746,6749-6750,6754-6755,6758,6763,6765-6767,6769-6770,6774-6777,6783,6785,6802-6805,6807-6809,6811-6814,6816-6819,6822,6824,6827,6835-6836,6841,6849,6860,6862,6866-6869

Property svn:ignore

r5942	r6878
56	56	public static double Calculate(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IRegressionProblemData problemData, IEnumerable<int> rows) {
57	57	IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
58		IEnumerable<double> originalValues = problemData.Dataset.Get~~EnumeratedVaria~~bleValues(problemData.TargetVariable, rows);
	58	IEnumerable<double> originalValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
59	59	IEnumerable<double> boundedEstimationValues = estimatedValues.LimitToRange(lowerEstimationLimit, upperEstimationLimit);
60	60	OnlineCalculatorError errorState;

-                      r5907
+                      r6878
       double[] trainingQuality = QualityParameter.ActualValue.Select(x => x.Value).ToArray();
+      var problemData = ProblemDataParameter.ActualValue;
+      var evaluator = EvaluatorParameter.ActualValue;
       // evaluate on validation partition
+      IExecutionContext childContext = (IExecutionContext)ExecutionContext.CreateChildOperation(EvaluatorParameter.ActualValue);
+      double[] validationQuality = (from tree in SymbolicExpressionTree
+                                    select EvaluatorParameter.ActualValue.Evaluate(childContext, tree, ProblemDataParameter.ActualValue, rows))
+                                   .ToArray();
+      IExecutionContext childContext = (IExecutionContext)ExecutionContext.CreateChildOperation(evaluator);
+      double[] validationQuality = SymbolicExpressionTree
+        .AsParallel()
+        .Select(t => evaluator.Evaluate(childContext, t, problemData, rows))
+        .ToArray();
       double r = 0.0;
       try {

r5942	r6878
56	56	public static double Calculate(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit, IRegressionProblemData problemData, IEnumerable<int> rows) {
57	57	IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
58		IEnumerable<double> originalValues = problemData.Dataset.Get~~EnumeratedVaria~~bleValues(problemData.TargetVariable, rows);
	58	IEnumerable<double> originalValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
59	59	OnlineCalculatorError errorState;
60	60	double r2 = OnlinePearsonsRSquaredCalculator.Calculate(estimatedValues, originalValues, out errorState);

-                      r5854
+                      r6878
       MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength;
+      SymbolicExpressionTreeGrammarParameter.ValueChanged += (o, e) => ConfigureGrammarSymbols();
+      ConfigureGrammarSymbols();
       InitializeOperators();
       UpdateEstimationLimits();
+    }
+    private void ConfigureGrammarSymbols() {
+      var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar;
+      if (grammar != null) grammar.ConfigureAsDefaultRegressionGrammar();
+    }
 …
     private void UpdateEstimationLimits() {
       if (ProblemData.TrainingPartition.Start < ProblemData.TrainingPartition.End) {
         var targetValues = ProblemData.Dataset.GetVariableValues(ProblemData.TargetVariable, ProblemData.TrainingPartition.Start, ProblemData.TrainingPartition.End);
+      if (ProblemData.TrainingIndizes.Any()) {
+        var targetValues = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).ToList();
         var mean = targetValues.Average();
         var range = targetValues.Max() - targetValues.Min();
         EstimationLimits.Upper = mean + PunishmentFactor * range;
         EstimationLimits.Lower = mean - PunishmentFactor * range;
+      } else {
+        EstimationLimits.Upper = double.MaxValue;
+        EstimationLimits.Lower = double.MinValue;
+      }
+    }

Note: See TracChangeset for help on using the changeset viewer.