Index: /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/AdjustedEvaluatedSolutionsAnalyzer.cs
===================================================================
--- /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/AdjustedEvaluatedSolutionsAnalyzer.cs (revision 16817)
+++ /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/AdjustedEvaluatedSolutionsAnalyzer.cs (revision 16818)
@@ -20,4 +20,5 @@
#endregion
+using HEAL.Attic;
using HeuristicLab.Common;
using HeuristicLab.Core;
@@ -25,5 +26,4 @@
using HeuristicLab.Optimization;
using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
using HeuristicLab.Problems.DataAnalysis.Symbolic;
using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
@@ -31,5 +31,5 @@
namespace HeuristicLab.OSGAEvaluator {
[Item("AdjustedEvaluatedSolutionsAnalyzer", "Analyzer which aggregates the adjusted evaluated solutions count from the predictive evaluator.")]
- [StorableClass]
+ [StorableType("791A5594-FC15-41AF-9D06-86D1313C4C8B")]
public class AdjustedEvaluatedSolutionsAnalyzer : SymbolicDataAnalysisSingleObjectiveAnalyzer {
private const string EvaluatorParameterName = "Evaluator";
@@ -49,5 +49,5 @@
[StorableConstructor]
- protected AdjustedEvaluatedSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
+ protected AdjustedEvaluatedSolutionsAnalyzer(StorableConstructorFlag _) : base(_) { }
protected AdjustedEvaluatedSolutionsAnalyzer(AdjustedEvaluatedSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) { }
Index: /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator.csproj
===================================================================
--- /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator.csproj (revision 16817)
+++ /branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator.csproj (revision 16818)
@@ -10,6 +10,7 @@
HeuristicLab.OSGAEvaluator
HeuristicLab.OSGAEvaluator
- v4.5.2
+ v4.6.1
512
+
@@ -17,5 +18,5 @@
full
false
- ..\..\..\trunk\sources\bin\
+ ..\..\..\trunk\bin\
DEBUG;TRACE
prompt
@@ -25,5 +26,5 @@
pdbonly
true
- ..\..\..\trunk\sources\bin\
+ ..\..\..\trunk\bin\
TRACE
prompt
@@ -37,72 +38,82 @@
+
+ False
+ ..\..\..\trunk\bin\HEAL.Attic.dll
+ False
+
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll
+ False
+
+
+ False
+ ..\..\..\trunk\bin\HeuristicLab.Attic.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
+ ..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ ..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
+ ..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
+ ..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
False
False
- ..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll
+ ..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll
False
@@ -119,4 +130,5 @@
+
@@ -127,4 +139,13 @@
+
+ set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+
+