Changeset 2981 for trunk/sources/HeuristicLab.Algorithms.TS/3.3

Timestamp:

03/09/10 18:14:06 (14 years ago)

Author:

abeham

Message:

Added a TS operator and a default TabuSelector #840

Location:

trunk/sources/HeuristicLab.Algorithms.TS/3.3

Files:

• HeuristicLab.Algorithms.TS-3.3.csproj (modified) (2 diffs)
• HeuristicLabAlgorithmsTSPlugin.cs.frame (modified) (1 diff)
• TSOperator.cs (modified) (5 diffs)
• TabuSelector.cs (added)

trunk/sources/HeuristicLab.Algorithms.TS/3.3/HeuristicLab.Algorithms.TS-3.3.csproj

@@ -83 +83 @@
     <Compile Include="HeuristicLabAlgorithmsTSPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TabuSelector.cs" />
     <Compile Include="TSOperator.cs" />
   </ItemGroup>
@@ -110 +111 @@
       <Name>HeuristicLab.Operators-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
       <Name>HeuristicLab.Parameters-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
+      <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
+      <Name>HeuristicLab.Selection-3.3</Name>
     </ProjectReference>
   </ItemGroup>

trunk/sources/HeuristicLab.Algorithms.TS/3.3/HeuristicLabAlgorithmsTSPlugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
-  //[PluginDependency("HeuristicLab.Evolutionary", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
-  //[PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  //[PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   //[PluginDependency("HeuristicLab.Random", "3.3")]
-  //[PluginDependency("HeuristicLab.Selection", "3.3")]
+  [PluginDependency("HeuristicLab.Selection", "3.3")]
   public class HeuristicLabAlgorithmsTSPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Algorithms.TS/3.3/TSOperator.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-//using HeuristicLab.Evolutionary;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-//using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.TS {
@@ -47 +45 @@
       get { return (ValueLookupParameter<IntData>)Parameters["MaximumIterations"]; }
     }
+    public ValueLookupParameter<IntData> TabuTenureParameter {
+      get { return (ValueLookupParameter<IntData>)Parameters["TabuTenure"]; }
+    }
     public ValueLookupParameter<VariableCollection> ResultsParameter {
       get { return (ValueLookupParameter<VariableCollection>)Parameters["Results"]; }
@@ -66 +67 @@
       Parameters.Add(new SubScopesLookupParameter<DoubleData>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new ValueLookupParameter<IntData>("MaximumIterations", "The maximum number of generations which should be processed."));
+      Parameters.Add(new ValueLookupParameter<IntData>("TabuTenure", "The length of the tabu list, and also means the number of iterations a move is kept tabu"));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the TS should be applied."));
       #endregion
 
-      #region Create operator graph
+      #region Create operators
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector = new ResultsCollector();
-
-      OperatorGraph.InitialOperator = variableCreator;
+      Placeholder moveGenerator = new Placeholder();
+      UniformSequentialSubScopesProcessor moveEvaluationProcessor = new UniformSequentialSubScopesProcessor();
+      Placeholder moveQualityEvaluator = new Placeholder();
+      Placeholder moveTabuEvaluator = new Placeholder();
+      SubScopesSorter moveQualitySorter = new SubScopesSorter();
+      Placeholder tabuSelector = new Placeholder();
+      SequentialSubScopesProcessor moveMakingProcessor = new SequentialSubScopesProcessor();
+      EmptyOperator emptyOp = new EmptyOperator();
+      UniformSequentialSubScopesProcessor actualMoveMakingProcessor = new UniformSequentialSubScopesProcessor();
+      Placeholder moveMaker = new Placeholder();
+      Placeholder moveTabuMaker = new Placeholder();
+      SubScopesRemover subScopesRemover = new SubScopesRemover();
+      IntCounter iterationsCounter = new IntCounter();
+      Comparator iterationsComparator = new Comparator();
+      ConditionalBranch iterationsTermination = new ConditionalBranch();
+      EmptyOperator finished = new EmptyOperator();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntData>("Iterations", new IntData(0)));
@@ -83 +99 @@
       variableCreator.CollectedValues.Add(new ValueParameter<DataTable>("Qualities", new DataTable("Qualities")));
       variableCreator.CollectedValues.Add(new ValueParameter<DataTable>("MoveQualities", new DataTable("MoveQualities")));
-      variableCreator.Successor = resultsCollector;
 
       resultsCollector.CollectedValues.Add(new LookupParameter<IntData>("Iterations"));
@@ -93 +108 @@
       resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>("MoveQualities"));
       resultsCollector.ResultsParameter.ActualName = "Results";
-      resultsCollector.Successor = null;
+
+      moveGenerator.Name = "MoveGenerator (placeholder)";
+      moveGenerator.OperatorParameter.ActualName = "MoveGenerator";
+
+      moveQualityEvaluator.Name = "MoveQualityEvaluator (placeholder)";
+      moveQualityEvaluator.OperatorParameter.ActualName = "MoveQualityEvaluator";
+
+      moveTabuEvaluator.Name = "MoveTabuEvaluator (placeholder)";
+      moveTabuEvaluator.OperatorParameter.ActualName = "MoveTabuEvaluator";
+
+      moveQualitySorter.DescendingParameter.ActualName = "Maximization";
+      moveQualitySorter.ValueParameter.ActualName = "MoveQuality";
+
+      tabuSelector.Name = "TabuSelector (placeholder)";
+      tabuSelector.OperatorParameter.ActualName = "TabuSelector";
+
+      moveMaker.Name = "MoveMaker (placeholder)";
+      moveMaker.OperatorParameter.ActualName = "MoveMaker";
+
+      moveTabuMaker.Name = "MoveTabuMaker (placeholder)";
+      moveTabuMaker.OperatorParameter.ActualName = "MoveTabuMaker";
+
+      subScopesRemover.RemoveAllSubScopes = true;
+
+      iterationsCounter.Increment = new IntData(1);
+      iterationsCounter.IncrementParameter.ActualName = "Iterations";
+
+      iterationsComparator.Comparison = new ComparisonData(Comparison.Less);
+      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
+      iterationsComparator.RightSideParameter.ActualName = "MaximumIterations";
+      iterationsComparator.ResultParameter.ActualName = "IterationsCondition";
+
+      iterationsTermination.ConditionParameter.ActualName = "IterationsCondition";
+      #endregion
+
+      #region Create operator graph
+      OperatorGraph.InitialOperator = variableCreator;
+      variableCreator.Successor = resultsCollector;
+      resultsCollector.Successor = moveGenerator;
+      moveGenerator.Successor = moveEvaluationProcessor;
+      moveEvaluationProcessor.Operator = moveQualityEvaluator;
+      moveQualityEvaluator.Successor = moveTabuEvaluator;
+      moveEvaluationProcessor.Successor = moveQualitySorter;
+      moveQualitySorter.Successor = tabuSelector;
+      tabuSelector.Successor = moveMakingProcessor;
+      moveMakingProcessor.Operators.AddRange(new Operator[] { emptyOp, actualMoveMakingProcessor });
+      actualMoveMakingProcessor.Operator = moveMaker;
+      moveMaker.Successor = moveTabuMaker;
+      moveMakingProcessor.Successor = subScopesRemover;
+      subScopesRemover.Successor = iterationsCounter;
+      iterationsCounter.Successor = iterationsComparator;
+      iterationsComparator.Successor = iterationsTermination;
+      iterationsTermination.TrueBranch = resultsCollector;
+      iterationsTermination.FalseBranch = finished;
       #endregion
     }