Changeset 11505 for branches

Timestamp:

10/27/14 17:03:27 (10 years ago)

Author:

abeham

Message:

#1614: updated to trunk changes

Location:

branches/GeneralizedQAP

Files:

• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPLocalImprovementOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

@@ -228 +228 @@
           Analyzer.Operators.SetItemCheckedState(a, a.EnabledByDefault);
         }
-        InitializeFromInstallation(LocalImprovementParameter, x => x.ProblemType.IsAssignableFrom(Problem.GetType()));
+        InitializeFromInstallation(LocalImprovementParameter, x => x is ILocalImprovementAlgorithmOperator
+          && ((ILocalImprovementAlgorithmOperator)x).ProblemType.IsInstanceOfType(Problem));
         InitializeFromProblem(PathRelinkingParameter);
         InitializeFromProblem(EliteSetReducerParameter);
@@ -251 +252 @@
         analyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
 
-        if (LocalImprovementParameter.Value != null)
-          LocalImprovementParameter.Value.Problem = Problem;
+        if (LocalImprovementParameter.Value != null) {
+          if (LocalImprovementParameter.Value is ILocalImprovementAlgorithmOperator)
+            ((ILocalImprovementAlgorithmOperator)LocalImprovementParameter.Value).Problem = Problem;
+        }
       }
       foreach (var localImprovement in LocalImprovementParameter.ValidValues) {

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user

@@ -3 +3 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>..\..\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
+    <StartProgram>C:\Users\P40311\Work\HL3\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
+    <StartArguments>/hideStarter /start:Optimizer</StartArguments>
   </PropertyGroup>
   <PropertyGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPLocalImprovementOperator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  public interface IGQAPLocalImprovementOperator : ILocalImprovementOperator {
+  public interface IGQAPLocalImprovementOperator : ILocalImprovementAlgorithmOperator {
     IValueLookupParameter<IntValue> MaximumCandidateListSizeParameter { get; }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs

@@ -86 +86 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one crossover to choose from.");
       return base.Apply();

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs

@@ -79 +79 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one manipulator to choose from.");
       return base.Apply();