Context Navigation

Changeset 5505 for branches

Timestamp:

02/17/11 12:04:02 (14 years ago)

Author:

mkommend

Message:

#1418: worked on single and multi objective evaluators.

Location:

branches/DataAnalysis Refactoring

Files:

r5501	r5505
109	109	<ItemGroup>
110	110	<Compile Include="MultiObjective\SymbolicClassificationMultiObjectiveEvaluator.cs" />
	111	<Compile Include="MultiObjective\SymbolicClassificationMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs" />
	112	<Compile Include="MultiObjective\SymbolicClassificationMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs" />
111	113	<Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveEvaluator.cs" />
112	114	<Compile Include="SingleObjective\SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs" />

r5501	r5505
35	35	}
36	36
37		protected SymbolicClassificationMultiObjectiveEvaluator()
38		: base() {
39
40		}
	37	protected SymbolicClassificationMultiObjectiveEvaluator() : base() { }
41	38	}
42	39	}

r5501	r5505
35	35	}
36	36
37		protected SymbolicClassificationSingleObjectiveEvaluator()
38		: base() {
39
40		}
	37	protected SymbolicClassificationSingleObjectiveEvaluator() : base() { }
41	38	}
42	39	}

r5501	r5505
40	40	}
41	41
	42	public SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator() : base() { }
	43
42	44	public override IOperation Apply() {
43	45	IEnumerable<int> rows = GenerateRowsToEvaluate();

r5501	r5505
40	40	}
41	41
	42	public SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator() : base() { }
	43
42	44	public override IOperation Apply() {
43	45	IEnumerable<int> rows = GenerateRowsToEvaluate();

-                      r5500
+                      r5505
     <Compile Include="Interfaces\ISymbolicRegressionMultiObjectiveEvaluator.cs" />
     <Compile Include="Interfaces\ISymbolicRegressionSingleObjectiveEvaluator.cs" />
+    <Compile Include="MultiObjective\Evaluators\SymbolicRegressionMultiObjectiveEvaluator.cs" />
+    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveEvaluator.cs" />
+    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" />
+    <Compile Include="SingleObjective\Evaluators\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
+    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveEvaluator.cs" />
+    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs" />
+    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs" />
+    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveEvaluator.cs" />
+    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" />
+    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs.frame" />

r5501	r5505
35	35	}
36	36
37		protected SymbolicRegressionMultiObjectiveEvaluator()
38		: base() {
39
40		}
	37	protected SymbolicRegressionMultiObjectiveEvaluator() : base() { }
41	38	}
42	39	}

r5501	r5505
35	35	}
36	36
37		protected SymbolicRegressionSingleObjectiveEvaluator()
38		: base() {
39
40		}
	37	protected SymbolicRegressionSingleObjectiveEvaluator() : base() { }
41	38	}
42	39	}

r5500	r5505
40	40	}
41	41
	42	public SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator() : base() { }
	43
42	44	public override IOperation Apply() {
43	45	IEnumerable<int> rows = GenerateRowsToEvaluate();

r5501	r5505
40	40	}
41	41
	42	public SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator() : base() { }
	43
42	44	public override IOperation Apply() {
43	45	IEnumerable<int> rows = GenerateRowsToEvaluate();

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