Context Navigation

HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

11/29/12 09:57:15 (12 years ago)

Author:

abeham

Message:

#1985: Synchronized with trunk

Location:

branches/RuntimeOptimizer

Files:

branches/RuntimeOptimizer
- Property svn:mergeinfo changed
  /branches/SlaveShutdown (added) merged: 8944-8945,8949,8951,8953-8954
  /trunk/sources (added) merged: 8946-8948,8950,8952,8957,8960,8962-8970

Property svn:mergeinfo changed

/branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 8388,8391-8392,8395,8409,8915-8916,8935,8937
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 8946,8965

Property svn:ignore

-                      old
+                      new
+*.user
+Plugin.cs
 bin
-*.user
-HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs
 obj
-*.vs10x
-Plugin.cs

-                      r8895
+                      r8971
     <Compile Include="Crossovers\SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs" />
     <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionCrossover.cs" />
+    <Compile Include="Interfaces\ISymbolicDataAnalysisImpactValuesCalculator.cs" />
     <Compile Include="Interpreter\InterpreterState.cs" />
     <Compile Include="Interpreter\OpCodes.cs" />
 …
     <Compile Include="SymbolicDataAnalysisExpressionTreeSimplifier.cs" />
     <Compile Include="SymbolicDataAnalysisProblem.cs" />
+    <Compile Include="SymbolicDataAnalysisSolutionImpactValuesCalculator.cs" />
     <Compile Include="Symbols\Addition.cs" />
     <Compile Include="Symbols\And.cs" />

r8936	r8971
357	357	Description = data.Description;
358	358	ProblemData = data;
359		~~OnReset();~~
360	359	}
361	360

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

/branches/SlaveShutdown (added)	merged: 8944-8945,8949,8951,8953-8954
/trunk/sources (added)	merged: 8946-8948,8950,8952,8957,8960,8962-8970