- Timestamp:
- 09/03/09 17:48:50 (15 years ago)
- Location:
- branches/gp-algorithms-refactoring-#720
- Files:
-
- 7 added
- 9 deleted
- 6 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs
r2328 r2331 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using HeuristicLab.DataAnalysis;28 27 using HeuristicLab.Evolutionary; 29 using HeuristicLab.GP.Interfaces;30 28 using HeuristicLab.Logging; 31 using HeuristicLab.Modeling;32 29 using HeuristicLab.Operators; 33 30 using HeuristicLab.Random; 34 31 using HeuristicLab.Selection; 35 using HeuristicLab. Operators.Programmable;36 37 namespace HeuristicLab.GP. StructureIdentification{38 public abstract class AlgorithmBase : ItemBase , IAlgorithm, IStochasticAlgorithm{32 using HeuristicLab.GP.Operators; 33 34 namespace HeuristicLab.GP.Algorithms { 35 public abstract class AlgorithmBase : ItemBase { 39 36 public virtual string Name { get { return "GP"; } } 40 37 public virtual string Description { get { return "TODO"; } } 41 42 public abstract Dataset Dataset { get; set; }43 public abstract int TargetVariable { get; set; }44 38 45 39 public virtual double MutationRate { … … 71 65 } 72 66 73 private IAnalyzerModel model;74 public virtual IAnalyzerModel Model {75 get {76 if (!engine.Terminated) throw new InvalidOperationException("The algorithm is still running. Wait until the algorithm is terminated to retrieve the result.");77 if (model == null) {78 IScope bestModelScope = engine.GlobalScope.SubScopes[0];79 model = CreateGPModel(bestModelScope);80 }81 return model;82 }83 }84 85 67 public virtual int Elites { 86 68 get { return GetVariableInjector().GetVariable("Elites").GetValue<IntData>().Data; } … … 101 83 get { return GetVariableInjector().GetVariable("Parents").GetValue<IntData>().Data; } 102 84 set { GetVariableInjector().GetVariable("Parents").GetValue<IntData>().Data = value; } 103 }104 105 public virtual bool UseEstimatedTargetValue {106 get { return GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data; }107 set { GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data = value; }108 85 } 109 86 … … 128 105 MaxTreeHeight = 10; 129 106 Parents = 2000; 130 UseEstimatedTargetValue = false;131 107 } 132 108 … … 141 117 142 118 IOperator globalInjector = CreateGlobalInjector(); 143 IOperator treeEvaluatorInjector = new HL2TreeEvaluatorInjector();144 119 IOperator initialization = CreateInitialization(); 145 120 IOperator funLibInjector = CreateFunctionLibraryInjector(); … … 149 124 150 125 IOperator treeCreator = CreateTreeCreator(); 151 152 MeanSquaredErrorEvaluator evaluator = new MeanSquaredErrorEvaluator();153 evaluator.GetVariableInfo("MSE").ActualName = "Quality";154 evaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";155 evaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";156 evaluator.Name = "Evaluator";157 126 158 127 IOperator crossover = CreateCrossover(); … … 165 134 seq.AddSubOperator(problemInjector); 166 135 seq.AddSubOperator(globalInjector); 167 seq.AddSubOperator(treeEvaluatorInjector);168 136 seq.AddSubOperator(funLibInjector); 169 137 seq.AddSubOperator(initialization); 170 138 seq.AddSubOperator(mainLoop); 171 139 seq.AddSubOperator(cleanUp); 172 seq.AddSubOperator(CreateModelAnalysisOperator());173 140 174 141 initialization.AddSubOperator(treeCreator); 175 initialization.AddSubOperator(evaluator);176 142 177 143 mainLoop.AddSubOperator(selector); … … 185 151 } 186 152 187 protected internal virtual IOperator CreateModelAnalysisOperator() {188 CombinedOperator op = new CombinedOperator();189 SequentialProcessor seq = new SequentialProcessor();190 SolutionExtractor extractor = new SolutionExtractor();191 extractor.GetVariableInfo("Scope").ActualName = "BestValidationSolution";192 SequentialSubScopesProcessor seqSubScopeProc = new SequentialSubScopesProcessor();193 SequentialProcessor solutionProc = new SequentialProcessor();194 195 seq.AddSubOperator(extractor);196 seq.AddSubOperator(seqSubScopeProc);197 seqSubScopeProc.AddSubOperator(solutionProc);198 199 HL2TreeEvaluatorInjector evaluatorInjector = new HL2TreeEvaluatorInjector();200 evaluatorInjector.AddVariable(new HeuristicLab.Core.Variable("PunishmentFactor", new DoubleData(1000.0)));201 evaluatorInjector.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";202 203 #region MSE204 MeanSquaredErrorEvaluator trainingMseEvaluator = new MeanSquaredErrorEvaluator();205 trainingMseEvaluator.Name = "TrainingMseEvaluator";206 trainingMseEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";207 trainingMseEvaluator.GetVariableInfo("MSE").ActualName = "TrainingMSE";208 trainingMseEvaluator.GetVariableInfo("SamplesStart").ActualName = "TrainingSamplesStart";209 trainingMseEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TrainingSamplesEnd";210 MeanSquaredErrorEvaluator validationMseEvaluator = new MeanSquaredErrorEvaluator();211 validationMseEvaluator.Name = "ValidationMseEvaluator";212 validationMseEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";213 validationMseEvaluator.GetVariableInfo("MSE").ActualName = "ValidationMSE";214 validationMseEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";215 validationMseEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";216 MeanSquaredErrorEvaluator testMseEvaluator = new MeanSquaredErrorEvaluator();217 testMseEvaluator.Name = "TestMeanSquaredErrorEvaluator";218 testMseEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";219 testMseEvaluator.GetVariableInfo("MSE").ActualName = "TestMSE";220 testMseEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";221 testMseEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";222 #endregion223 #region MAPE224 MeanAbsolutePercentageErrorEvaluator trainingMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();225 trainingMapeEvaluator.Name = "TrainingMapeEvaluator";226 trainingMapeEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";227 trainingMapeEvaluator.GetVariableInfo("MAPE").ActualName = "TrainingMAPE";228 trainingMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";229 trainingMapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";230 MeanAbsolutePercentageErrorEvaluator validationMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();231 validationMapeEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";232 validationMapeEvaluator.Name = "ValidationMapeEvaluator";233 validationMapeEvaluator.GetVariableInfo("MAPE").ActualName = "ValidationMAPE";234 validationMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";235 validationMapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";236 MeanAbsolutePercentageErrorEvaluator testMapeEvaluator = new MeanAbsolutePercentageErrorEvaluator();237 testMapeEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";238 testMapeEvaluator.Name = "TestMapeEvaluator";239 testMapeEvaluator.GetVariableInfo("MAPE").ActualName = "TestMAPE";240 testMapeEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";241 testMapeEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";242 #endregion243 #region MAPRE244 MeanAbsolutePercentageOfRangeErrorEvaluator trainingMapreEvaluator = new MeanAbsolutePercentageOfRangeErrorEvaluator();245 trainingMapreEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";246 trainingMapreEvaluator.Name = "TrainingMapreEvaluator";247 trainingMapreEvaluator.GetVariableInfo("MAPRE").ActualName = "TrainingMAPRE";248 trainingMapreEvaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";249 trainingMapreEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";250 MeanAbsolutePercentageOfRangeErrorEvaluator validationMapreEvaluator = new MeanAbsolutePercentageOfRangeErrorEvaluator();251 validationMapreEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";252 validationMapreEvaluator.Name = "ValidationMapreEvaluator";253 validationMapreEvaluator.GetVariableInfo("MAPRE").ActualName = "ValidationMAPRE";254 validationMapreEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";255 validationMapreEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";256 MeanAbsolutePercentageOfRangeErrorEvaluator testMapreEvaluator = new MeanAbsolutePercentageOfRangeErrorEvaluator();257 testMapreEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";258 testMapreEvaluator.Name = "TestMapreEvaluator";259 testMapreEvaluator.GetVariableInfo("MAPRE").ActualName = "TestMAPRE";260 testMapreEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";261 testMapreEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";262 #endregion MAPRE263 #region R2264 CoefficientOfDeterminationEvaluator trainingR2Evaluator = new CoefficientOfDeterminationEvaluator();265 trainingR2Evaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";266 trainingR2Evaluator.Name = "TrainingR2Evaluator";267 trainingR2Evaluator.GetVariableInfo("R2").ActualName = "TrainingR2";268 trainingR2Evaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";269 trainingR2Evaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";270 CoefficientOfDeterminationEvaluator validationR2Evaluator = new CoefficientOfDeterminationEvaluator();271 validationR2Evaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";272 validationR2Evaluator.Name = "ValidationR2Evaluator";273 validationR2Evaluator.GetVariableInfo("R2").ActualName = "ValidationR2";274 validationR2Evaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";275 validationR2Evaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";276 CoefficientOfDeterminationEvaluator testR2Evaluator = new CoefficientOfDeterminationEvaluator();277 testR2Evaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";278 testR2Evaluator.Name = "TestR2Evaluator";279 testR2Evaluator.GetVariableInfo("R2").ActualName = "TestR2";280 testR2Evaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";281 testR2Evaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";282 #endregion283 #region VAF284 VarianceAccountedForEvaluator trainingVAFEvaluator = new VarianceAccountedForEvaluator();285 trainingVAFEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";286 trainingVAFEvaluator.Name = "TrainingVAFEvaluator";287 trainingVAFEvaluator.GetVariableInfo("VAF").ActualName = "TrainingVAF";288 trainingVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";289 trainingVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";290 VarianceAccountedForEvaluator validationVAFEvaluator = new VarianceAccountedForEvaluator();291 validationVAFEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";292 validationVAFEvaluator.Name = "ValidationVAFEvaluator";293 validationVAFEvaluator.GetVariableInfo("VAF").ActualName = "ValidationVAF";294 validationVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "ValidationSamplesStart";295 validationVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "ValidationSamplesEnd";296 VarianceAccountedForEvaluator testVAFEvaluator = new VarianceAccountedForEvaluator();297 testVAFEvaluator.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";298 testVAFEvaluator.Name = "TestVAFEvaluator";299 testVAFEvaluator.GetVariableInfo("VAF").ActualName = "TestVAF";300 testVAFEvaluator.GetVariableInfo("SamplesStart").ActualName = "TestSamplesStart";301 testVAFEvaluator.GetVariableInfo("SamplesEnd").ActualName = "TestSamplesEnd";302 #endregion303 304 solutionProc.AddSubOperator(evaluatorInjector);305 solutionProc.AddSubOperator(trainingMseEvaluator);306 solutionProc.AddSubOperator(validationMseEvaluator);307 solutionProc.AddSubOperator(testMseEvaluator);308 solutionProc.AddSubOperator(trainingMapeEvaluator);309 solutionProc.AddSubOperator(validationMapeEvaluator);310 solutionProc.AddSubOperator(testMapeEvaluator);311 solutionProc.AddSubOperator(trainingMapreEvaluator);312 solutionProc.AddSubOperator(validationMapreEvaluator);313 solutionProc.AddSubOperator(testMapreEvaluator);314 solutionProc.AddSubOperator(trainingR2Evaluator);315 solutionProc.AddSubOperator(validationR2Evaluator);316 solutionProc.AddSubOperator(testR2Evaluator);317 solutionProc.AddSubOperator(trainingVAFEvaluator);318 solutionProc.AddSubOperator(validationVAFEvaluator);319 solutionProc.AddSubOperator(testVAFEvaluator);320 321 #region variable impacts322 // calculate and set variable impacts323 VariableNamesExtractor namesExtractor = new VariableNamesExtractor();324 namesExtractor.GetVariableInfo("VariableNames").ActualName = "InputVariableNames";325 PredictorBuilder predictorBuilder = new PredictorBuilder();326 predictorBuilder.GetVariableInfo("TreeEvaluator").ActualName = "ModelAnalysisTreeEvaluator";327 predictorBuilder.AddVariable(new HeuristicLab.Core.Variable("PunishmentFactor", new DoubleData(1000.0)));328 329 VariableEvaluationImpactCalculator evaluationImpactCalculator = new VariableEvaluationImpactCalculator();330 evaluationImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";331 evaluationImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";332 VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();333 qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";334 qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";335 336 solutionProc.AddSubOperator(namesExtractor);337 solutionProc.AddSubOperator(predictorBuilder);338 solutionProc.AddSubOperator(evaluationImpactCalculator);339 solutionProc.AddSubOperator(qualityImpactCalculator);340 #endregion341 342 op.OperatorGraph.AddOperator(seq);343 op.OperatorGraph.InitialOperator = seq;344 return op;345 }346 347 153 protected internal virtual IOperator CreateProblemInjector() { 348 154 return new EmptyOperator(); 349 155 } 350 156 351 protected internal abstract IOperator CreateSelector(); 352 353 protected internal abstract IOperator CreateCrossover(); 157 protected virtual IOperator CreateSelector() { 158 return new EmptyOperator(); 159 } 160 161 protected virtual IOperator CreateCrossover() { 162 return new StandardCrossOver(); 163 } 354 164 355 165 protected internal abstract IOperator CreateTreeCreator(); -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/OffSpringSelectionGpEditor.Designer.cs
r2326 r2331 20 20 #endregion 21 21 22 namespace HeuristicLab.GP. StructureIdentification{22 namespace HeuristicLab.GP.Algorithms { 23 23 partial class OffspringSelectionGpEditor { 24 24 /// <summary> -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/OffSpringSelectionGpEditor.cs
r2326 r2331 25 25 using HeuristicLab.Core; 26 26 27 namespace HeuristicLab.GP. StructureIdentification{27 namespace HeuristicLab.GP.Algorithms { 28 28 public partial class OffspringSelectionGpEditor : EditorBase { 29 29 private ChooseOperatorDialog chooseOperatorDialog; -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs
r2326 r2331 30 30 using HeuristicLab.Selection.OffspringSelection; 31 31 32 namespace HeuristicLab.GP. StructureIdentification{32 namespace HeuristicLab.GP.Algorithms { 33 33 public class OffspringSelectionGP : StandardGP { 34 34 public override string Name { get { return "OffspringSelectionGP"; } } -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/StandardGP.cs
r2328 r2331 21 21 22 22 using HeuristicLab.Core; 23 using HeuristicLab.DataAnalysis;24 23 using HeuristicLab.Operators; 25 24 using HeuristicLab.Selection; 26 25 using HeuristicLab.Logging; 27 26 using HeuristicLab.Data; 28 using HeuristicLab.Operators.Programmable;29 using HeuristicLab.Modeling;30 27 using HeuristicLab.GP.Operators; 31 28 32 namespace HeuristicLab.GP. StructureIdentification{29 namespace HeuristicLab.GP.Algorithms { 33 30 public class StandardGP : AlgorithmBase, IEditable { 34 31 -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/StandardGpEditor.Designer.cs
r2326 r2331 20 20 #endregion 21 21 22 namespace HeuristicLab.GP. StructureIdentification{22 namespace HeuristicLab.GP.Algorithms { 23 23 partial class StandardGpEditor { 24 24 /// <summary> -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.Algorithms/3.2/StandardGpEditor.cs
r2326 r2331 25 25 using HeuristicLab.PluginInfrastructure; 26 26 27 namespace HeuristicLab.GP. StructureIdentification{27 namespace HeuristicLab.GP.Algorithms { 28 28 public partial class StandardGpEditor : EditorBase { 29 29 private ChooseOperatorDialog chooseOperatorDialog; -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj
r2328 r2331 82 82 </ItemGroup> 83 83 <ItemGroup> 84 <Compile Include="BaseClasses\AlgorithmBase.cs" />85 84 <Compile Include="BaseClasses\FunctionTreeBase.cs" /> 86 85 <Compile Include="BaseClasses\TreeEvaluatorBase.cs" /> … … 128 127 <Compile Include="Evaluators\MeanAbsolutePercentageOfRangeErrorEvaluator.cs" /> 129 128 <Compile Include="FunctionLibraryInjector.cs" /> 130 <Compile Include="OffspringSelectionGP.cs" />131 <Compile Include="OffSpringSelectionGpEditor.cs">132 <SubType>UserControl</SubType>133 </Compile>134 <Compile Include="OffSpringSelectionGpEditor.Designer.cs">135 <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>136 </Compile>137 <Compile Include="StandardGpEditor.cs">138 <SubType>UserControl</SubType>139 </Compile>140 <Compile Include="StandardGpEditor.Designer.cs">141 <DependentUpon>StandardGpEditor.cs</DependentUpon>142 </Compile>143 <Compile Include="StandardGP.cs" />144 129 <Compile Include="Evaluators\CoefficientOfDeterminationEvaluator.cs" /> 145 130 <Compile Include="Evaluators\UncertainMeanSquaredErrorEvaluator.cs" /> … … 227 212 </ItemGroup> 228 213 <ItemGroup> 229 <EmbeddedResource Include="OffSpringSelectionGpEditor.resx">230 <DependentUpon>OffSpringSelectionGpEditor.cs</DependentUpon>231 </EmbeddedResource>232 214 <EmbeddedResource Include="PredictorView.resx"> 233 215 <DependentUpon>PredictorView.cs</DependentUpon> 234 </EmbeddedResource>235 <EmbeddedResource Include="StandardGpEditor.resx">236 <DependentUpon>StandardGpEditor.cs</DependentUpon>237 <SubType>Designer</SubType>238 216 </EmbeddedResource> 239 217 </ItemGroup> -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.Hive.Server.Core/3.2/app.config
r1530 r2331 9 9 <HeuristicLab.Hive.Server.Core.Properties.Settings> 10 10 <setting name="HiveServerConnectionString" serializeAs="String"> 11 <value>Data Source=10.20.71.10;Initial Catalog=HeuristicLab.Hive ;Persist Security Info=True;User ID=hive;Password=hive;Pooling=true;MultipleActiveResultSets=true</value>11 <value>Data Source=10.20.71.10;Initial Catalog=HeuristicLab.Hive_Milestone3;Persist Security Info=True;User ID=hive;Password=hive;Pooling=true;MultipleActiveResultSets=true</value> 12 12 </setting> 13 13 </HeuristicLab.Hive.Server.Core.Properties.Settings> -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.Tracing/3.2/HeuristicLab.Hive.log4net.xml
r2062 r2331 18 18 <lossy value="true" /> 19 19 <evaluator type="log4net.Core.LevelEvaluator"> 20 <threshold value=" INFO"/>20 <threshold value="DEBUG"/> 21 21 </evaluator> 22 22 <appender-ref ref="RollingFileAppender" /> … … 24 24 25 25 <root> 26 <level value=" INFO" />26 <level value="DEBUG" /> 27 27 <appender-ref ref="BufferingForwardingAppender" /> 28 28 </root> -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab.sln
r2316 r2331 251 251 EndProject 252 252 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Common-3.2", "HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj", "{1FC004FC-59AF-4249-B1B6-FF25873A20E4}" 253 EndProject 254 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.GP.Algorithms-3.2", "HeuristicLab.GP.Algorithms\3.2\HeuristicLab.GP.Algorithms-3.2.csproj", "{3127719F-110E-4558-8845-98559DBB422D}" 253 255 EndProject 254 256 Global … … 4025 4027 {1FC004FC-59AF-4249-B1B6-FF25873A20E4}.Visualization Debug|x86.ActiveCfg = Debug|x86 4026 4028 {1FC004FC-59AF-4249-B1B6-FF25873A20E4}.Visualization Debug|x86.Build.0 = Debug|x86 4029 {3127719F-110E-4558-8845-98559DBB422D}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU 4030 {3127719F-110E-4558-8845-98559DBB422D}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU 4031 {3127719F-110E-4558-8845-98559DBB422D}.CEDMA Debug|x64.ActiveCfg = Debug|Any CPU 4032 {3127719F-110E-4558-8845-98559DBB422D}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU 4033 {3127719F-110E-4558-8845-98559DBB422D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 4034 {3127719F-110E-4558-8845-98559DBB422D}.Debug|Any CPU.Build.0 = Debug|Any CPU 4035 {3127719F-110E-4558-8845-98559DBB422D}.Debug|x64.ActiveCfg = Debug|x64 4036 {3127719F-110E-4558-8845-98559DBB422D}.Debug|x64.Build.0 = Debug|x64 4037 {3127719F-110E-4558-8845-98559DBB422D}.Debug|x86.ActiveCfg = Debug|x86 4038 {3127719F-110E-4558-8845-98559DBB422D}.Debug|x86.Build.0 = Debug|x86 4039 {3127719F-110E-4558-8845-98559DBB422D}.Modeling Debug|Any CPU.ActiveCfg = Debug|Any CPU 4040 {3127719F-110E-4558-8845-98559DBB422D}.Modeling Debug|Any CPU.Build.0 = Debug|Any CPU 4041 {3127719F-110E-4558-8845-98559DBB422D}.Modeling Debug|x64.ActiveCfg = Debug|Any CPU 4042 {3127719F-110E-4558-8845-98559DBB422D}.Modeling Debug|x86.ActiveCfg = Debug|Any CPU 4043 {3127719F-110E-4558-8845-98559DBB422D}.Release|Any CPU.ActiveCfg = Release|Any CPU 4044 {3127719F-110E-4558-8845-98559DBB422D}.Release|Any CPU.Build.0 = Release|Any CPU 4045 {3127719F-110E-4558-8845-98559DBB422D}.Release|x64.ActiveCfg = Release|x64 4046 {3127719F-110E-4558-8845-98559DBB422D}.Release|x86.ActiveCfg = Release|x86 4047 {3127719F-110E-4558-8845-98559DBB422D}.Release|x86.Build.0 = Release|x86 4048 {3127719F-110E-4558-8845-98559DBB422D}.v3.2 Debug|Any CPU.ActiveCfg = Debug|Any CPU 4049 {3127719F-110E-4558-8845-98559DBB422D}.v3.2 Debug|Any CPU.Build.0 = Debug|Any CPU 4050 {3127719F-110E-4558-8845-98559DBB422D}.v3.2 Debug|x64.ActiveCfg = Debug|Any CPU 4051 {3127719F-110E-4558-8845-98559DBB422D}.v3.2 Debug|x86.ActiveCfg = Debug|Any CPU 4052 {3127719F-110E-4558-8845-98559DBB422D}.Visualization Debug|Any CPU.ActiveCfg = Debug|Any CPU 4053 {3127719F-110E-4558-8845-98559DBB422D}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU 4054 {3127719F-110E-4558-8845-98559DBB422D}.Visualization Debug|x64.ActiveCfg = Debug|Any CPU 4055 {3127719F-110E-4558-8845-98559DBB422D}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU 4027 4056 EndGlobalSection 4028 4057 GlobalSection(SolutionProperties) = preSolution … … 4119 4148 {1263BB36-1F20-4960-A5CB-530746DBAD77} = {410732DB-725A-4824-896B-C298978343C0} 4120 4149 {1FC004FC-59AF-4249-B1B6-FF25873A20E4} = {410732DB-725A-4824-896B-C298978343C0} 4150 {3127719F-110E-4558-8845-98559DBB422D} = {410732DB-725A-4824-896B-C298978343C0} 4121 4151 {A9E282EA-180F-4233-B809-AEDF0787545C} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B} 4122 4152 {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {78982D7C-D63D-4A3D-AE1F-F58AC007603B} -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab/CopyAssemblies.cmd
r2316 r2331 8 8 9 9 copy "%SolutionDir%\HeuristicLab.AdvancedOptimizationFrontend\3.2\%Outdir%\HeuristicLab.AdvancedOptimizationFrontend-3.2.dll" .\plugins 10 copy "%SolutionDir%\HeuristicLab.AdvancedOptimizationFrontend\3.3\%Outdir%\HeuristicLab.AdvancedOptimizationFrontend-3.3.dll" .\plugins10 REM copy "%SolutionDir%\HeuristicLab.AdvancedOptimizationFrontend\3.3\%Outdir%\HeuristicLab.AdvancedOptimizationFrontend-3.3.dll" .\plugins 11 11 copy "%SolutionDir%\WinFormsUI\%Outdir%\WeifenLuo.WinFormsUI.Docking.dll" .\plugins 12 12 copy "%SolutionDir%\WinFormsUI\%Outdir%\WeifenLuo.WinFormsUI.Docking License.txt" .\plugins … … 17 17 copy "%SolutionDir%\HeuristicLab.CEDMA.Server\3.3\%Outdir%\HeuristicLab.CEDMA.Server-3.3.dll" .\plugins 18 18 copy "%SolutionDir%\HeuristicLab.Charting\3.2\%Outdir%\HeuristicLab.Charting-3.2.dll" .\plugins 19 copy "%SolutionDir%\HeuristicLab.Charting\3.3\%Outdir%\HeuristicLab.Charting-3.3.dll" .\plugins19 REM copy "%SolutionDir%\HeuristicLab.Charting\3.3\%Outdir%\HeuristicLab.Charting-3.3.dll" .\plugins 20 20 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.2\%Outdir%\HeuristicLab.Charting.Data-3.2.dll" .\plugins 21 copy "%SolutionDir%\HeuristicLab.Charting.Data\3.3\%Outdir%\HeuristicLab.Charting.Data-3.3.dll" .\plugins21 REM copy "%SolutionDir%\HeuristicLab.Charting.Data\3.3\%Outdir%\HeuristicLab.Charting.Data-3.3.dll" .\plugins 22 22 copy "%SolutionDir%\HeuristicLab.Common\3.2\%Outdir%\HeuristicLab.Common-3.2.dll" .\plugins 23 23 copy "%SolutionDir%\HeuristicLab.Common.Resources\3.2\%Outdir%\HeuristicLab.Common.Resources-3.2.dll" .\plugins … … 25 25 copy "%SolutionDir%\HeuristicLab.Communication.Operators\3.2\%Outdir%\HeuristicLab.Communication.Operators-3.2.dll" .\plugins 26 26 copy "%SolutionDir%\HeuristicLab.Core\3.2\%Outdir%\HeuristicLab.Core-3.2.dll" .\plugins 27 copy "%SolutionDir%\HeuristicLab.Core\3.3\%Outdir%\HeuristicLab.Core-3.3.dll" .\plugins27 REM copy "%SolutionDir%\HeuristicLab.Core\3.3\%Outdir%\HeuristicLab.Core-3.3.dll" .\plugins 28 28 copy "%SolutionDir%\HeuristicLab.Constraints\3.2\%Outdir%\HeuristicLab.Constraints-3.2.dll" .\plugins 29 copy "%SolutionDir%\HeuristicLab.Constraints\3.3\%Outdir%\HeuristicLab.Constraints-3.3.dll" .\plugins29 REM copy "%SolutionDir%\HeuristicLab.Constraints\3.3\%Outdir%\HeuristicLab.Constraints-3.3.dll" .\plugins 30 30 copy "%SolutionDir%\HeuristicLab.Data\3.2\%Outdir%\HeuristicLab.Data-3.2.dll" .\plugins 31 copy "%SolutionDir%\HeuristicLab.Data\3.3\%Outdir%\HeuristicLab.Data-3.3.dll" .\plugins31 REM copy "%SolutionDir%\HeuristicLab.Data\3.3\%Outdir%\HeuristicLab.Data-3.3.dll" .\plugins 32 32 copy "%SolutionDir%\HeuristicLab.DataAccess\3.2\%Outdir%\HeuristicLab.DataAccess-3.2.dll" .\plugins 33 33 copy "%SolutionDir%\HeuristicLab.DataAccess.ADOHelper\3.2\%Outdir%\HeuristicLab.DataAccess.ADOHelper-3.2.dll" .\plugins 34 34 copy "%SolutionDir%\HeuristicLab.DataAnalysis\3.2\%Outdir%\HeuristicLab.DataAnalysis-3.2.dll" .\plugins 35 copy "%SolutionDir%\HeuristicLab.DataAnalysis\3.3\%Outdir%\HeuristicLab.DataAnalysis-3.3.dll" .\plugins35 REM copy "%SolutionDir%\HeuristicLab.DataAnalysis\3.3\%Outdir%\HeuristicLab.DataAnalysis-3.3.dll" .\plugins 36 36 copy "%SolutionDir%\HeuristicLab.DistributedEngine\3.2\%Outdir%\HeuristicLab.DistributedEngine-3.2.dll" .\plugins 37 37 copy "%SolutionDir%\HeuristicLab.ES\3.2\%Outdir%\HeuristicLab.ES-3.2.dll" .\plugins 38 38 copy "%SolutionDir%\HeuristicLab.Evolutionary\3.2\%Outdir%\HeuristicLab.Evolutionary-3.2.dll" .\plugins 39 copy "%SolutionDir%\HeuristicLab.Evolutionary\3.3\%Outdir%\HeuristicLab.Evolutionary-3.3.dll" .\plugins39 REM copy "%SolutionDir%\HeuristicLab.Evolutionary\3.3\%Outdir%\HeuristicLab.Evolutionary-3.3.dll" .\plugins 40 40 copy "%SolutionDir%\HeuristicLab.GP\3.3\%Outdir%\HeuristicLab.GP-3.3.dll" .\plugins 41 copy "%SolutionDir%\HeuristicLab.GP\3.4\%Outdir%\HeuristicLab.GP-3.4.dll" .\plugins41 REM copy "%SolutionDir%\HeuristicLab.GP\3.4\%Outdir%\HeuristicLab.GP-3.4.dll" .\plugins 42 42 copy "%SolutionDir%\HeuristicLab.GP.Interfaces\3.3\%Outdir%\HeuristicLab.GP.Interfaces-3.3.dll" .\plugins 43 43 copy "%SolutionDir%\HeuristicLab.GP.Operators\3.3\%Outdir%\HeuristicLab.GP.Operators-3.3.dll" .\plugins … … 45 45 copy "%SolutionDir%\HeuristicLab.GP.SantaFe\3.3\%Outdir%\HeuristicLab.GP.SantaFe-3.3.dll" .\plugins 46 46 copy "%SolutionDir%\HeuristicLab.GP.StructureIdentification\3.3\%Outdir%\HeuristicLab.GP.StructureIdentification-3.3.dll" .\plugins 47 copy "%SolutionDir%\HeuristicLab.GP.StructureIdentification\3.4\%Outdir%\HeuristicLab.GP.StructureIdentification-3.4.dll" .\plugins47 REM copy "%SolutionDir%\HeuristicLab.GP.StructureIdentification\3.4\%Outdir%\HeuristicLab.GP.StructureIdentification-3.4.dll" .\plugins 48 48 copy "%SolutionDir%\HeuristicLab.GP.StructureIdentification.Classification\3.3\%Outdir%\HeuristicLab.GP.StructureIdentification.Classification-3.3.dll" .\plugins 49 49 copy "%SolutionDir%\HeuristicLab.GP.StructureIdentification.ConditionalEvaluation\3.3\%Outdir%\HeuristicLab.GP.StructureIdentification.ConditionalEvaluation-3.3.dll" .\plugins … … 72 72 copy "%SolutionDir%\HeuristicLab.LinearRegression\3.2\%Outdir%\ALGLIB License.txt" .\plugins 73 73 copy "%SolutionDir%\HeuristicLab.Logging\3.2\%Outdir%\HeuristicLab.Logging-3.2.dll" .\plugins 74 copy "%SolutionDir%\HeuristicLab.Logging\3.3\%Outdir%\HeuristicLab.Logging-3.3.dll" .\plugins74 REM copy "%SolutionDir%\HeuristicLab.Logging\3.3\%Outdir%\HeuristicLab.Logging-3.3.dll" .\plugins 75 75 copy "%SolutionDir%\HeuristicLab.MainForm\3.2\%Outdir%\HeuristicLab.MainForm-3.2.dll" .\plugins 76 76 copy "%SolutionDir%\HeuristicLab.MainForm.Test\3.2\%Outdir%\HeuristicLab.MainForm.Test-3.2.dll" .\plugins 77 77 copy "%SolutionDir%\HeuristicLab.Modeling\3.2\%Outdir%\HeuristicLab.Modeling-3.2.dll" .\plugins 78 copy "%SolutionDir%\HeuristicLab.Modeling\3.3\%Outdir%\HeuristicLab.Modeling-3.3.dll" .\plugins78 REM copy "%SolutionDir%\HeuristicLab.Modeling\3.3\%Outdir%\HeuristicLab.Modeling-3.3.dll" .\plugins 79 79 copy "%SolutionDir%\HeuristicLab.Modeling.Database\3.2\%Outdir%\HeuristicLab.Modeling.Database-3.2.dll" .\plugins 80 80 copy "%SolutionDir%\HeuristicLab.Modeling.Database.SQLServerCompact\3.2\%Outdir%\HeuristicLab.Modeling.Database.SQLServerCompact-3.2.dll" .\plugins 81 81 copy "%SolutionDir%\HeuristicLab.Operators\3.2\%Outdir%\HeuristicLab.Operators-3.2.dll" .\plugins 82 copy "%SolutionDir%\HeuristicLab.Operators\3.3\%Outdir%\HeuristicLab.Operators-3.3.dll" .\plugins82 REM copy "%SolutionDir%\HeuristicLab.Operators\3.3\%Outdir%\HeuristicLab.Operators-3.3.dll" .\plugins 83 83 copy "%SolutionDir%\HeuristicLab.Operators.Metaprogramming\3.2\%Outdir%\HeuristicLab.Operators.Metaprogramming-3.2.dll" .\plugins 84 84 copy "%SolutionDir%\HeuristicLab.Operators.Programmable\3.2\%Outdir%\HeuristicLab.Operators.Programmable-3.2.dll" .\plugins 85 copy "%SolutionDir%\HeuristicLab.Operators.Programmable\3.3\%Outdir%\HeuristicLab.Operators.Programmable-3.3.dll" .\plugins85 REM copy "%SolutionDir%\HeuristicLab.Operators.Programmable\3.3\%Outdir%\HeuristicLab.Operators.Programmable-3.3.dll" .\plugins 86 86 copy "%SolutionDir%\HeuristicLab.Operators.Stopwatch\3.2\%Outdir%\HeuristicLab.Operators.Stopwatch-3.2.dll" .\plugins 87 87 copy "%SolutionDir%\HeuristicLab.OptimizationFrontend\3.2\%Outdir%\HeuristicLab.OptimizationFrontend-3.2.dll" .\plugins 88 88 copy "%SolutionDir%\HeuristicLab.OptimizationFrontend\3.3\%Outdir%\HeuristicLab.OptimizationFrontend-3.3.dll" .\plugins 89 89 copy "%SolutionDir%\HeuristicLab.Permutation\3.2\%Outdir%\HeuristicLab.Permutation-3.2.dll" .\plugins 90 copy "%SolutionDir%\HeuristicLab.Permutation\3.3\%Outdir%\HeuristicLab.Permutation-3.3.dll" .\plugins90 REM copy "%SolutionDir%\HeuristicLab.Permutation\3.3\%Outdir%\HeuristicLab.Permutation-3.3.dll" .\plugins 91 91 copy "%SolutionDir%\HeuristicLab.Persistence\3.3\%Outdir%\HeuristicLab.Persistence-3.3.dll" .\plugins 92 92 copy "%SolutionDir%\HeuristicLab.Persistence.GUI\3.3\%Outdir%\HeuristicLab.Persistence.GUI-3.3.dll" .\plugins 93 93 copy "%SolutionDir%\HeuristicLab.Random\3.2\%Outdir%\HeuristicLab.Random-3.2.dll" .\plugins 94 copy "%SolutionDir%\HeuristicLab.Random\3.3\%Outdir%\HeuristicLab.Random-3.3.dll" .\plugins94 REM copy "%SolutionDir%\HeuristicLab.Random\3.3\%Outdir%\HeuristicLab.Random-3.3.dll" .\plugins 95 95 copy "%SolutionDir%\HeuristicLab.RealVector\3.2\%Outdir%\HeuristicLab.RealVector-3.2.dll" .\plugins 96 96 copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.2\%Outdir%\HeuristicLab.Routing.TSP-3.2.dll" .\plugins 97 copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.3\%Outdir%\HeuristicLab.Routing.TSP-3.3.dll" .\plugins97 REM copy "%SolutionDir%\HeuristicLab.Routing.TSP\3.3\%Outdir%\HeuristicLab.Routing.TSP-3.3.dll" .\plugins 98 98 copy "%SolutionDir%\HeuristicLab.SA\3.2\%Outdir%\HeuristicLab.SA-3.2.dll" .\plugins 99 99 copy "%SolutionDir%\HeuristicLab.Scheduling.JSSP\3.2\%Outdir%\HeuristicLab.Scheduling.JSSP-3.2.dll" .\plugins 100 100 copy "%SolutionDir%\HeuristicLab.Selection\3.2\%Outdir%\HeuristicLab.Selection-3.2.dll" .\plugins 101 copy "%SolutionDir%\HeuristicLab.Selection\3.3\%Outdir%\HeuristicLab.Selection-3.3.dll" .\plugins101 REM copy "%SolutionDir%\HeuristicLab.Selection\3.3\%Outdir%\HeuristicLab.Selection-3.3.dll" .\plugins 102 102 copy "%SolutionDir%\HeuristicLab.Selection.OffspringSelection\3.2\%Outdir%\HeuristicLab.Selection.OffspringSelection-3.2.dll" .\plugins 103 copy "%SolutionDir%\HeuristicLab.Selection.OffspringSelection\3.3\%Outdir%\HeuristicLab.Selection.OffspringSelection-3.3.dll" .\plugins103 REM copy "%SolutionDir%\HeuristicLab.Selection.OffspringSelection\3.3\%Outdir%\HeuristicLab.Selection.OffspringSelection-3.3.dll" .\plugins 104 104 copy "%SolutionDir%\HeuristicLab.Selection.Uncertainty\3.2\%Outdir%\HeuristicLab.Selection.Uncertainty-3.2.dll" .\plugins 105 105 copy "%SolutionDir%\HeuristicLab.SequentialEngine\3.2\%Outdir%\HeuristicLab.SequentialEngine-3.2.dll" .\plugins 106 copy "%SolutionDir%\HeuristicLab.SequentialEngine\3.3\%Outdir%\HeuristicLab.SequentialEngine-3.3.dll" .\plugins106 REM copy "%SolutionDir%\HeuristicLab.SequentialEngine\3.3\%Outdir%\HeuristicLab.SequentialEngine-3.3.dll" .\plugins 107 107 copy "%SolutionDir%\HeuristicLab.SGA\3.2\%Outdir%\HeuristicLab.SGA-3.2.dll" .\plugins 108 copy "%SolutionDir%\HeuristicLab.SGA\3.3\%Outdir%\HeuristicLab.SGA-3.3.dll" .\plugins108 REM copy "%SolutionDir%\HeuristicLab.SGA\3.3\%Outdir%\HeuristicLab.SGA-3.3.dll" .\plugins 109 109 copy "%SolutionDir%\HeuristicLab.FixedOperators\3.2\%Outdir%\HeuristicLab.FixedOperators-3.2.dll" .\plugins 110 110 copy "%SolutionDir%\HeuristicLab.SimOpt\3.2\%Outdir%\HeuristicLab.SimOpt-3.2.dll" .\plugins … … 119 119 copy "%SolutionDir%\LibSVM\%Outdir%\LibSVM.dll" .\plugins 120 120 copy "%SolutionDir%\HeuristicLab.TestFunctions\3.2\%Outdir%\HeuristicLab.TestFunctions-3.2.dll" .\plugins 121 copy "%SolutionDir%\HeuristicLab.TestFunctions\3.3\%Outdir%\HeuristicLab.TestFunctions-3.3.dll" .\plugins121 REM copy "%SolutionDir%\HeuristicLab.TestFunctions\3.3\%Outdir%\HeuristicLab.TestFunctions-3.3.dll" .\plugins 122 122 copy "%SolutionDir%\HeuristicLab.ThreadParallelEngine\3.2\%Outdir%\HeuristicLab.ThreadParallelEngine-3.2.dll" .\plugins 123 copy "%SolutionDir%\HeuristicLab.ThreadParallelEngine\3.3\%Outdir%\HeuristicLab.ThreadParallelEngine-3.3.dll" .\plugins123 REM copy "%SolutionDir%\HeuristicLab.ThreadParallelEngine\3.3\%Outdir%\HeuristicLab.ThreadParallelEngine-3.3.dll" .\plugins 124 124 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll" .\plugins 125 125 copy "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\log4net.dll" .\plugins -
branches/gp-algorithms-refactoring-#720/sources/HeuristicLab/app.config
r2223 r2331 10 10 <system.serviceModel> 11 11 </system.serviceModel> 12 12 <runtime> 13 <gcServer enabled="true" /> 14 </runtime> 13 15 <system.data> 14 16 <DbProviderFactories>
Note: See TracChangeset
for help on using the changeset viewer.