Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/19/12 13:17:29 (13 years ago)
Author:
ascheibe
Message:

#1722 fixed more licensing information and source formatting

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/IPotvinPDExchangeMoveOperator.cs

    r6773 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
    24 using HeuristicLab.Optimization;
    2523using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2624

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs

    r6856 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
     22using System.Collections.Generic;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Parameters;
    27 using System.Collections.Generic;
    2827using HeuristicLab.Problems.VehicleRouting.Interfaces;
    29 using HeuristicLab.Common;
    3028using HeuristicLab.Problems.VehicleRouting.Variants;
    3129

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs

    r7906 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
     22using System;
     23using HeuristicLab.Common;
    2224using HeuristicLab.Core;
     25using HeuristicLab.Optimization;
    2326using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    24 using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Common;
    26 using System.Collections.Generic;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    28 using HeuristicLab.Data;
    2928using HeuristicLab.Problems.VehicleRouting.Interfaces;
    30 using HeuristicLab.Optimization;
    31 using System;
    3229
    3330namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3431  [Item("PotvinPDExchangeMove", "Item that describes a exchange move on a PDP representation.")]
    3532  [StorableClass]
    36   public class PotvinPDExchangeMove: Item, IVRPMove {
     33  public class PotvinPDExchangeMove : Item, IVRPMove {
    3734    [Storable]
    3835    public IVRPEncoding Individual { get; protected set; }
    39    
     36
    4037    [Storable]
    4138    public int City { get; protected set; }
    … …  
    4946    [Storable]
    5047    public int Replaced { get; protected set; }
    51    
    52     public PotvinPDExchangeMove(): base() {
     48
     49    public PotvinPDExchangeMove()
     50      : base() {
    5351      City = -1;
    5452      Tour = -1;
    … …  
    9593
    9694    [ThreadStatic]
    97     private static PotvinPDExchangeMoveMaker moveMaker; 
     95    private static PotvinPDExchangeMoveMaker moveMaker;
    9896    public VRPMoveMaker GetMoveMaker() {
    9997      if (moveMaker == null)

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveEvaluator.cs

    r6773 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Encodings.PermutationEncoding;
     24using HeuristicLab.Data;
    2425using HeuristicLab.Parameters;
    2526using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    27 using HeuristicLab.Common;
    28 using HeuristicLab.Optimization;
    2927
    3028namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    … …  
    5755    public PotvinPDExchangeMoveEvaluator()
    5856      : base() {
    59         Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The move that should be evaluated."));
     57      Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The move that should be evaluated."));
    6058
    61        Parameters.Add(new LookupParameter<VariableCollection>("Memories", "The TS memory collection."));
    62        Parameters.Add(new ValueParameter<StringValue>("AdditionFrequencyMemoryKey", "The key that is used for the addition frequency in the TS memory.", new StringValue("AdditionFrequency")));
    63        Parameters.Add(new ValueParameter<DoubleValue>("Lambda", "The lambda parameter.", new DoubleValue(0.015)));
     59      Parameters.Add(new LookupParameter<VariableCollection>("Memories", "The TS memory collection."));
     60      Parameters.Add(new ValueParameter<StringValue>("AdditionFrequencyMemoryKey", "The key that is used for the addition frequency in the TS memory.", new StringValue("AdditionFrequency")));
     61      Parameters.Add(new ValueParameter<DoubleValue>("Lambda", "The lambda parameter.", new DoubleValue(0.015)));
    6462    }
    6563
    … …  
    7977
    8078      UpdateEvaluation(newSolution);
    81     } 
     79    }
    8280  }
    8381}

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveGenerator.cs

    r6773 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
     22using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Optimization;
     24using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Parameters;
    27 using System.Collections.Generic;
    2826using HeuristicLab.Problems.VehicleRouting.Interfaces;
    29 using HeuristicLab.Common;
    3027
    3128namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    … …  
    5047    public PotvinPDExchangeMoveGenerator()
    5148      : base() {
    52         Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be generated in subscopes."));
    53         Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
     49      Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be generated in subscopes."));
     50      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
    5451    }
    5552

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs

    r7906 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
     22using HeuristicLab.Common;
    2223using HeuristicLab.Core;
    23 using HeuristicLab.Data;
    24 using HeuristicLab.Operators;
    2524using HeuristicLab.Optimization;
    2625using HeuristicLab.Parameters;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Common;
    29 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    3027using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3128using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    4845    public PotvinPDExchangeMoveMaker()
    4946      : base() {
    50         Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be made."));
     47      Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be made."));
    5148    }
    5249

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuCriterion.cs

    r7791 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    4949    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    5050      get { return (LookupParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }
    51     } 
     51    }
    5252
    5353    public ILookupParameter<ItemList<IItem>> TabuListParameter {
    … …  
    158158        }
    159159      }
    160      
     160
    161161      MoveTabuParameter.ActualValue = new BoolValue(isTabu);
    162162      return base.Apply();

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuMaker.cs

    r7791 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Optimization.Operators;
     24using HeuristicLab.Data;
     25using HeuristicLab.Operators;
     26using HeuristicLab.Optimization;
    2527using HeuristicLab.Parameters;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2729using HeuristicLab.Problems.VehicleRouting.Interfaces;
    28 using HeuristicLab.Operators;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Optimization;
    3130
    3231namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    … …  
    5049    }
    5150
    52    
     51
    5352    public ILookupParameter<PotvinPDExchangeMove> PDExchangeMoveParameter {
    5453      get { return (ILookupParameter<PotvinPDExchangeMove>)Parameters["PotvinPDExchangeMove"]; }
    … …  
    8887      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
    8988
    90         Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be made."));
    91         Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
    92         Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
     89      Parameters.Add(new LookupParameter<PotvinPDExchangeMove>("PotvinPDExchangeMove", "The moves that should be made."));
     90      Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The VRP tours considered in the move."));
     91      Parameters.Add(new LookupParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
    9392
    94         Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance of the individual"));
    95         Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload of the individual"));
    96         Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness of the individual"));
    97         Parameters.Add(new LookupParameter<IntValue>("PickupViolations", "The number of pickup violations."));
     93      Parameters.Add(new LookupParameter<DoubleValue>("Distance", "The distance of the individual"));
     94      Parameters.Add(new LookupParameter<DoubleValue>("Overload", "The overload of the individual"));
     95      Parameters.Add(new LookupParameter<DoubleValue>("Tardiness", "The tardiness of the individual"));
     96      Parameters.Add(new LookupParameter<IntValue>("PickupViolations", "The number of pickup violations."));
    9897    }
    9998

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMultiMoveGenerator.cs

    r6909 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
     22using System.Collections.Generic;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     25using HeuristicLab.Data;
    2426using HeuristicLab.Optimization;
     27using HeuristicLab.Parameters;
    2528using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Parameters;
    27 using System.Collections.Generic;
     29using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2830using HeuristicLab.Problems.VehicleRouting.Interfaces;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Data;
    31 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3231
    3332namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs

    r6909 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
     22using System.Collections.Generic;
     23using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
     26using HeuristicLab.Parameters;
    2527using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Parameters;
    27 using System.Collections.Generic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Data;
    31 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3229using HeuristicLab.Problems.VehicleRouting.Variants;
    3330
    … …  
    3633  [StorableClass]
    3734  public sealed class PotvinPDExchangeSingleMoveGenerator : PotvinPDExchangeMoveGenerator,
    38     ISingleMoveGenerator {   
     35    ISingleMoveGenerator {
    3936    public ILookupParameter<IRandom> RandomParameter {
    4037      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
    … …  
    10198      } else {
    10299        return null;
    103       }             
     100      }
    104101    }
    105102
Note: See TracChangeset for help on using the changeset viewer.