Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter

Timestamp:

12/10/17 22:11:10 (7 years ago)

Author:

abeham

Message:

#1614: refactored code

• change problem to derive from basic problem
• using a combined instance class instead of individual parameters

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter

Files:

• . (added)
• IBestKnownQualityAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IBestKnownQualityAwareGQAPOperator.cs) (1 diff)
• IBestKnownSolutionAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IBestKnownSolutionAwareGQAPOperator.cs) (1 diff)
• IBestKnownSolutionsAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IBestKnownSolutionsAwareGQAPOperator.cs) (1 diff)
• IMoveQualityAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IMoveQualityAwareGQAPOperator.cs) (2 diffs)
• IProblemInstanceAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IExpectedRandomQualityAwareGQAPOperator.cs) (2 diffs)
• IQualitiesAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IQualitiesAwareGQAPOperator.cs) (2 diffs)
• IQualityAwareGQAPOperator.cs (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IQualityAwareGQAPOperator.cs) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownQualityAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionsAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IMoveQualityAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   public interface IMoveQualityAwareGQAPOperator : IGQAPMoveOperator {
-    ILookupParameter<BoolValue> MaximizationParameter { get; }
     ILookupParameter<DoubleValue> MoveQualityParameter { get; }
-    ILookupParameter<DoubleValue> MoveFlowDistanceQualityParameter { get; }
-    ILookupParameter<DoubleValue> MoveInstallationQualityParameter { get; }
-    ILookupParameter<DoubleValue> MoveOverbookedCapacityParameter { get; }
+    ILookupParameter<Evaluation> MoveEvaluationParameter { get; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IProblemInstanceAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  public interface IExpectedRandomQualityAwareGQAPOperator : IGQAPOperator {
-    IValueLookupParameter<DoubleValue> ExpectedRandomQualityParameter { get; }
+  public interface IProblemInstanceAwareGQAPOperator : IGQAPOperator {
+    ILookupParameter<GQAPInstance> ProblemInstanceParameter { get; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualitiesAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   public interface IQualitiesAwareGQAPOperator : IGQAPOperator {
-    ILookupParameter<BoolValue> MaximizationParameter { get; }
     IScopeTreeLookupParameter<DoubleValue> QualityParameter { get; }
-    IScopeTreeLookupParameter<DoubleValue> FlowDistanceQualityParameter { get; }
-    IScopeTreeLookupParameter<DoubleValue> InstallationQualityParameter { get; }
-    IScopeTreeLookupParameter<DoubleValue> OverbookedCapacityParameter { get; }
+    IScopeTreeLookupParameter<Evaluation> EvaluationParameter { get; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualityAwareGQAPOperator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
   public interface IQualityAwareGQAPOperator : IGQAPOperator {
-    ILookupParameter<BoolValue> MaximizationParameter { get; }
     ILookupParameter<DoubleValue> QualityParameter { get; }
-    ILookupParameter<DoubleValue> FlowDistanceQualityParameter { get; }
-    ILookupParameter<DoubleValue> InstallationQualityParameter { get; }
-    ILookupParameter<DoubleValue> OverbookedCapacityParameter { get; }
+    ILookupParameter<Evaluation> EvaluationParameter { get; }
   }
 }