Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/27/12 13:24:36 (13 years ago)
Author:
abeham
Message:

#1614

  • reworked parameterization (one interface for every parameter resp. parameter group)
  • unified parameter descriptions
Location:
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs

    r7413 r7419  
    3131  [Item("GQAPMoveGenerator", "Base class for move generators for the Generalized Quadratic Assignment Problem.")]
    3232  [StorableClass]
    33   public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator, IGQAPMoveOperator {
     33  public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IAssignmentAwareGQAPOperator, IMoveGenerator, IGQAPMoveOperator {
    3434
    3535    public ILookupParameter<IntegerVector> AssignmentParameter {
    … …  
    4242    public GQAPMoveGenerator()
    4343      : base() {
    44       Parameters.Add(new LookupParameter<IntegerVector>("Assignment", "The current equipment-location assignment."));
     44      Parameters.Add(new LookupParameter<IntegerVector>("Assignment", GQAPSolutionCreator.AssignmentDescription));
    4545    }
    4646  }

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.cs

    r7413 r7419  
    3434  public abstract class GQAPNMoveGenerator : GQAPMoveGenerator, IGQAPNMoveOperator {
    3535
     36    #region Parameter Descriptions
     37    public static readonly string MoveDescription = "Moves represent changes to the current solution. The n-move changes the assignment of up to or exactly n equipments.";
     38    #endregion
     39
    3640    public ILookupParameter<NMove> MoveParameter {
    3741      get { return (ILookupParameter<NMove>)Parameters["Move"]; }
    … …  
    4650    public GQAPNMoveGenerator()
    4751      : base() {
    48       Parameters.Add(new LookupParameter<NMove>("Move", "The move to generate."));
     52      Parameters.Add(new LookupParameter<NMove>("Move", MoveDescription));
    4953      Parameters.Add(new ValueLookupParameter<IntValue>("N", "The maximum number of equipment(s) that should be moved.", new IntValue(2)));
    5054    }

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

    r7413 r7419  
    3232  [Item("NMoveMaker", "Performs an n-move.")]
    3333  [StorableClass]
    34   public class NMoveMaker : SingleSuccessorOperator, IGQAPNMoveOperator, IMoveMaker {
     34  public class NMoveMaker : SingleSuccessorOperator, IAssignmentAwareGQAPOperator, IQualityAwareGQAPOperator, IMoveQualityAwareGQAPOperator, IGQAPNMoveOperator, IMoveMaker {
    3535
    3636    public ILookupParameter<IntegerVector> AssignmentParameter {
    … …  
    3939    public ILookupParameter<NMove> MoveParameter {
    4040      get { return (ILookupParameter<NMove>)Parameters["Move"]; }
     41    }
     42    ILookupParameter<BoolValue> IQualityAwareGQAPOperator.MaximizationParameter {
     43      get { return MaximizationParameter; }
     44    }
     45    ILookupParameter<BoolValue> IMoveQualityAwareGQAPOperator.MaximizationParameter {
     46      get { return MaximizationParameter; }
     47    }
     48    public ILookupParameter<BoolValue> MaximizationParameter {
     49      get { return (ILookupParameter<BoolValue>)Parameters["Maximization"]; }
    4150    }
    4251    public ILookupParameter<DoubleValue> QualityParameter {
    … …  
    7079    public NMoveMaker()
    7180      : base() {
    72       Parameters.Add(new LookupParameter<IntegerVector>("Assignment", "The equipment-location assignment vector."));
    73       Parameters.Add(new LookupParameter<NMove>("Move", "The move to perform."));
    74       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The solution quality."));
    75       Parameters.Add(new LookupParameter<DoubleValue>("FlowDistanceQuality", "The quality regarding the flow-distance criteria."));
    76       Parameters.Add(new LookupParameter<DoubleValue>("InstallationQuality", "The quality regarding the installation costs."));
    77       Parameters.Add(new LookupParameter<DoubleValue>("OverbookedCapacity", "The sum of the overbooked capacities relative to the capacity of each location."));
    78       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the move if it would be applied."));
    79       Parameters.Add(new LookupParameter<DoubleValue>("MoveFlowDistanceQuality", "The quality of the move regarding the flow-distance criteria."));
    80       Parameters.Add(new LookupParameter<DoubleValue>("MoveInstallationQuality", "The quality of the move regarding the installation costs."));
    81       Parameters.Add(new LookupParameter<DoubleValue>("MoveOverbookedCapacity", "The sum of the overbooked capacities of the move relative to the capacity of each location."));
     81      Parameters.Add(new LookupParameter<IntegerVector>("Assignment", GQAPSolutionCreator.AssignmentDescription));
     82      Parameters.Add(new LookupParameter<NMove>("Move", GQAPNMoveGenerator.MoveDescription));
     83      Parameters.Add(new LookupParameter<BoolValue>("Maximization", GeneralizedQuadraticAssignmentProblem.MaximizationDescription));
     84      Parameters.Add(new LookupParameter<DoubleValue>("Quality", GQAPEvaluator.QualityDescription));
     85      Parameters.Add(new LookupParameter<DoubleValue>("FlowDistanceQuality", GQAPEvaluator.FlowDistanceQualityDescription));
     86      Parameters.Add(new LookupParameter<DoubleValue>("InstallationQuality", GQAPEvaluator.InstallationQualityDescription));
     87      Parameters.Add(new LookupParameter<DoubleValue>("OverbookedCapacity", GQAPEvaluator.OverbookedCapacityDescription));
     88      Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", GQAPNMoveEvaluator.MoveQualityDescription));
     89      Parameters.Add(new LookupParameter<DoubleValue>("MoveFlowDistanceQuality", GQAPNMoveEvaluator.MoveFlowDistanceQualityDescription));
     90      Parameters.Add(new LookupParameter<DoubleValue>("MoveInstallationQuality", GQAPNMoveEvaluator.MoveInstallationQualityDescription));
     91      Parameters.Add(new LookupParameter<DoubleValue>("MoveOverbookedCapacity", GQAPNMoveEvaluator.MoveOverbookedCapacityDescription));
    8292    }
    8393

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.cs

    r7413 r7419  
    3232  [Item("Stochastic n-move MultiMoveGenerator", "Randomly samples a number of n-moves.")]
    3333  [StorableClass]
    34   public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, ILocationAwareGQAPOperator, IMultiMoveGenerator, IStochasticOperator {
     34  public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, ICapacitiesAwareGQAPOperator, IStochasticOperator, IMultiMoveGenerator {
    3535
     36    public ILookupParameter<DoubleArray> CapacitiesParameter {
     37      get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
     38    }
    3639    public ILookupParameter<IRandom> RandomParameter {
    3740      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
    38     }
    39     public ILookupParameter<DoubleArray> CapacitiesParameter {
    40       get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
    4141    }
    4242    public IValueLookupParameter<IntValue> SampleSizeParameter {
    … …  
    5050      : base() {
    5151      Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator that should be used."));
    52       Parameters.Add(new LookupParameter<DoubleArray>("Capacities", "Capacities of the locations."));
     52      Parameters.Add(new LookupParameter<DoubleArray>("Capacities", GeneralizedQuadraticAssignmentProblem.CapacitiesDescription));
    5353      Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
    5454    }

  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

    r7413 r7419  
    3232  [Item("Stochastic n-move SingleMoveGenerator", "Randomly samples a single n-move.")]
    3333  [StorableClass]
    34   public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, ILocationAwareGQAPOperator, ISingleMoveGenerator, IStochasticOperator {
     34  public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, ICapacitiesAwareGQAPOperator, IStochasticOperator, ISingleMoveGenerator {
    3535
     36    public ILookupParameter<DoubleArray> CapacitiesParameter {
     37      get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
     38    }
    3639    public ILookupParameter<IRandom> RandomParameter {
    3740      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
    38     }
    39     public ILookupParameter<DoubleArray> CapacitiesParameter {
    40       get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
    4141    }
    4242
    … …  
    4747      : base() {
    4848      Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator that should be used."));
    49       Parameters.Add(new LookupParameter<DoubleArray>("Capacities", "Capacities of the locations."));
     49      Parameters.Add(new LookupParameter<DoubleArray>("Capacities", GeneralizedQuadraticAssignmentProblem.CapacitiesDescription));
    5050    }
    5151
Note: See TracChangeset for help on using the changeset viewer.