Changeset 13952

Timestamp:

06/29/16 14:12:53 (8 years ago)

Author:

mkommend

Message:

#2571: Merged r13580, r13581, r13677, r13679, r13680, r13863 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.Algorithms.RandomSearch (copied) (copied from trunk/sources/HeuristicLab.Algorithms.RandomSearch)
• HeuristicLab.Algorithms.RandomSearch/3.3/HeuristicLab.Algorithms.RandomSearch-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs (modified) (12 diffs)

stable/HeuristicLab 3.3.sln

@@ -28 +28 @@
     {E2419315-B10A-4BC1-B517-A24DCF4C59AC} = {E2419315-B10A-4BC1-B517-A24DCF4C59AC}
     {9372D115-D933-40D2-BD29-A2C1EAC35874} = {9372D115-D933-40D2-BD29-A2C1EAC35874}
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1} = {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}
     {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9} = {B7FA451C-26BF-4EE5-8E0E-BECAADA5B8E9}
     {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
@@ -452 +453 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP.Views-3.3", "HeuristicLab.Problems.PTSP.Views\3.3\HeuristicLab.Problems.PTSP.Views-3.3.csproj", "{90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.RandomSearch-3.3", "HeuristicLab.Algorithms.RandomSearch\3.3\HeuristicLab.Algorithms.RandomSearch-3.3.csproj", "{4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}"
 EndProject
 Global
@@ -2203 +2206 @@
     {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.ActiveCfg = Release|x86
     {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.Build.0 = Release|x86
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|x64.ActiveCfg = Debug|x64
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|x64.Build.0 = Debug|x64
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|x86.ActiveCfg = Debug|x86
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Debug|x86.Build.0 = Debug|x86
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|Any CPU.Build.0 = Release|Any CPU
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x64.ActiveCfg = Release|x64
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x64.Build.0 = Release|x64
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.ActiveCfg = Release|x86
+    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

stable/HeuristicLab.Algorithms.RandomSearch/3.3/HeuristicLab.Algorithms.RandomSearch-3.3.csproj

@@ -136 +136 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
-set ProjectDir=$(ProjectDir)
-set SolutionDir=$(SolutionDir)
-set Outdir=$(Outdir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+      set ProjectDir=$(ProjectDir)
+      set SolutionDir=$(SolutionDir)
+      set Outdir=$(Outdir)
 
-call PreBuildEvent.cmd
-</PreBuildEvent>
+      call PreBuildEvent.cmd
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+      export ProjectDir=$(ProjectDir)
+      export SolutionDir=$(SolutionDir)
+
+      $SolutionDir/PreBuildEvent.sh
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

stable/HeuristicLab.Algorithms.RandomSearch/3.3/RandomSearchAlgorithm.cs

@@ -35 +35 @@
 
 namespace HeuristicLab.Algorithms.RandomSearch {
-  [Item("Random Search Algorithm", "An random search algorithm.")]
+  [Item("Random Search Algorithm (RS)", "A random search algorithm.")]
   [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 150)]
   [StorableClass]
@@ -63 +63 @@
       get { return (IFixedValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
-    private IFixedValueParameter<IntValue> NumberOfSamplesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["NumberOfSamples"]; }
+    private IFixedValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
     }
     private IFixedValueParameter<IntValue> BatchSizeParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["BatchSize"]; }
     }
-    private IFixedValueParameter<IntValue> NumberOfBatchesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters["NumberOfBatches"]; }
+    private IFixedValueParameter<IntValue> MaximumIterationsParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["MaximumIterations"]; }
     }
     private IFixedValueParameter<MultiTerminator> TerminatorParameter {
@@ -89 +89 @@
       get { return AnalyzerParameter.Value; }
     }
-    public int NumberOfSamples {
-      get { return NumberOfSamplesParameter.Value.Value; }
-      set { NumberOfSamplesParameter.Value.Value = value; }
+    public int MaximumEvaluatedSolutions {
+      get { return MaximumEvaluatedSolutionsParameter.Value.Value; }
+      set { MaximumEvaluatedSolutionsParameter.Value.Value = value; }
     }
     public int BatchSize {
@@ -97 +97 @@
       set { BatchSizeParameter.Value.Value = value; }
     }
-    public int NumberOfBatches {
-      get { return NumberOfBatchesParameter.Value.Value; }
-      set { NumberOfBatchesParameter.Value.Value = value; }
+    public int MaximumIterations {
+      get { return MaximumIterationsParameter.Value.Value; }
+      set { MaximumIterationsParameter.Value.Value = value; }
     }
     public MultiTerminator Terminators {
@@ -151 +151 @@
       Parameters.Add(new FixedValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new FixedValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
-      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze all individuals from all layers combined.", new MultiAnalyzer()));
-      Parameters.Add(new FixedValueParameter<IntValue>("NumberOfSamples", "The number of random samples the algorithm should evaluate.", new IntValue(1000)));
-      Parameters.Add(new FixedValueParameter<IntValue>("BatchSize", "The number of random samples that are evaluated (in parallel) until they are analyzed.", new IntValue(100)));
-      Parameters.Add(new FixedValueParameter<IntValue>("NumberOfBatches", "The number batch runs (iterations) that the algorithm will run.", new IntValue(10)) { Hidden = true });
+      Parameters.Add(new FixedValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the solutions each iteration.", new MultiAnalyzer()));
+      Parameters.Add(new FixedValueParameter<IntValue>("MaximumEvaluatedSolutions", "The number of random solutions the algorithm should evaluate.", new IntValue(1000)));
+      Parameters.Add(new FixedValueParameter<IntValue>("BatchSize", "The number of random solutions that are evaluated (in parallel) per iteration.", new IntValue(100)));
+      Parameters.Add(new FixedValueParameter<IntValue>("MaximumIterations", "The number of iterations that the algorithm will run.", new IntValue(10)) { Hidden = true });
       Parameters.Add(new FixedValueParameter<MultiTerminator>("Terminator", "The termination criteria that defines if the algorithm should continue or stop.", new MultiTerminator()) { Hidden = true });
       #endregion
@@ -166 +166 @@
       var evaluationsCounter = new IntCounter() { Name = "Increment EvaluatedSolutions" };
       var subScopesRemover = new SubScopesRemover();
-      var batchNumberCounter = new IntCounter() { Name = "Increment BatchNumber" };
+      var iterationsCounter = new IntCounter() { Name = "Increment Iterations" };
       var terminationOperator = new TerminationOperator();
       #endregion
@@ -179 +179 @@
       randomCreator.Successor = variableCreator;
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("BatchNumber", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
       variableCreator.Successor = resultsCollector;
 
-      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("BatchNumber", "The current batch number."));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", "The current iteration number."));
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The current number of evaluated solutions."));
       resultsCollector.Successor = solutionCreator;
@@ -200 +200 @@
 
       subScopesRemover.RemoveAllSubScopes = true;
-      subScopesRemover.Successor = batchNumberCounter;
-
-      batchNumberCounter.ValueParameter.ActualName = "BatchNumber";
-      batchNumberCounter.Increment = new IntValue(1);
-      batchNumberCounter.Successor = terminationOperator;
+      subScopesRemover.Successor = iterationsCounter;
+
+      iterationsCounter.ValueParameter.ActualName = "Iterations";
+      iterationsCounter.Increment = new IntValue(1);
+      iterationsCounter.Successor = terminationOperator;
 
       terminationOperator.TerminatorParameter.ActualName = TerminatorParameter.Name;
@@ -215 +215 @@
 
       #region Create terminators
-      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, NumberOfSamplesParameter) { Name = "Number of Samples" };
+      evaluationsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", ComparisonType.Less, MaximumEvaluatedSolutionsParameter) { Name = "Evaluated solutions." };
       qualityTerminator = new SingleObjectiveQualityTerminator() { Name = "Quality" };
       executionTimeTerminator = new ExecutionTimeTerminator(this, new TimeSpanValue(TimeSpan.FromMinutes(5)));
@@ -312 +312 @@
       singleObjectiveQualityAnalyzer.CurrentBestQualityParameter.NameChanged += QualityAnalyzer_CurrentBestQualityParameter_NameChanged;
 
-      NumberOfSamplesParameter.Value.ValueChanged += NumberOfSamples_ValueChanged;
+      MaximumEvaluatedSolutionsParameter.Value.ValueChanged += MaximumEvaluatedSolutions_ValueChanged;
       BatchSizeParameter.Value.ValueChanged += BatchSize_ValueChanged;
-      NumberOfBatchesParameter.Value.ValueChanged += NumberOfBatches_ValueChanged;
     }
     private void ParameterizeSolutionsCreator() {
@@ -337 +336 @@
       if (Problem != null) {
         foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
-          op.IterationsParameter.ActualName = "BatchNumber";
+          op.IterationsParameter.ActualName = "Iterations";
           op.IterationsParameter.Hidden = true;
-          op.MaximumIterationsParameter.ActualName = NumberOfBatchesParameter.Name;
+          op.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
         }
       }
@@ -354 +353 @@
       }
     }
-    private void NumberOfSamples_ValueChanged(object sender, EventArgs e) {
-      NumberOfBatches = NumberOfSamples / BatchSize;
+    private void MaximumEvaluatedSolutions_ValueChanged(object sender, EventArgs e) {
+      MaximumIterations = MaximumEvaluatedSolutions / BatchSize;
     }
     private void BatchSize_ValueChanged(object sender, EventArgs e) {
-      NumberOfBatches = NumberOfSamples / BatchSize;
-    }
-    private void NumberOfBatches_ValueChanged(object sender, EventArgs e) {
-      BatchSize = NumberOfSamples / NumberOfBatches;
+      MaximumIterations = MaximumEvaluatedSolutions / BatchSize;
     }
     #endregion