Changeset 5785 for branches/QAP/HeuristicLab.Optimization

Timestamp:

03/22/11 01:56:25 (14 years ago)

Author:

abeham

Message:

#1330

• Added Swap2 move to permutation (+tabu search operators)
• Added move evaluators for QAP (translocation/insertion missing)
• Merged trunk-changes from Optimization into QAP branch

Location:

branches/QAP/HeuristicLab.Optimization/3.3

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• Interfaces/ILocalImprovementOperator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs)
• UserDefinedProblem.cs (modified) (2 diffs)

branches/QAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -143 +143 @@
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
     <Compile Include="Interfaces\IGlobalParticleUpdater.cs" />
+    <Compile Include="Interfaces\ILocalImprovementOperator.cs" />
     <Compile Include="Interfaces\ILocalParticleUpdater.cs" />
     <Compile Include="Interfaces\IMultiAnalyzer.cs" />
@@ -247 +248 @@
 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabOptimizationPlugin.cs"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>copy "$(TargetPath)" "C:\Program Files\HeuristicLab 3.3\"</PostBuildEvent>
+  </PropertyGroup>
 </Project>

branches/QAP/HeuristicLab.Optimization/3.3/UserDefinedProblem.cs

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Optimization {
@@ -222 +223 @@
     [Item("EmptyUserDefinedProblemEvaluator", "A dummy evaluator that will throw an exception when executed.")]
     [StorableClass]
+    [NonDiscoverableType]
     private sealed class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {