Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/22/10 00:44:01 (14 years ago)
Author:
swagner
Message:

Sorted usings and removed unused usings in entire solution (#1094)

Location:
trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveMaker.cs

    r3938 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Optimization;
    2822using HeuristicLab.Core;
     23using HeuristicLab.Data;
     24using HeuristicLab.Parameters;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3226
    3327namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveOperator.cs

    r3947 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Core;
     23using HeuristicLab.Encodings.PermutationEncoding;
    2724using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Encodings.PermutationEncoding;
    29 using HeuristicLab.Parameters;
    3025
    3126namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    … …  
    3530    [Storable]
    3631    protected abstract IPermutationMoveOperator PermutationMoveOperatorParameter { get; set; }
    37    
     32
    3833    public override IOperation Apply() {
    3934      IVRPEncoding solution = VRPSolutionParameter.ActualValue;

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.cs

    r3947 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
     23using HeuristicLab.Encodings.PermutationEncoding;
     24using HeuristicLab.Parameters;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Core;
    28 using HeuristicLab.Parameters;
    29 using HeuristicLab.Encodings.PermutationEncoding;
    3026using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
    31 using HeuristicLab.Data;
    3227
    3328namespace HeuristicLab.Problems.VehicleRouting {
    3429  [Item("AlbaTranslocationMoveEvaluator", "Evaluates a translocation or insertion move (3-opt) for the VRP.")]
    3530  [StorableClass]
    36   public sealed class AlbaTranslocationMoveEvaluator: VRPMoveEvaluator {
     31  public sealed class AlbaTranslocationMoveEvaluator : VRPMoveEvaluator {
    3732    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    3833      get { return (ILookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

    r4047 r4068  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.Core;
     24using HeuristicLab.Data;
    2625using HeuristicLab.Encodings.PermutationEncoding;
    2726using HeuristicLab.Optimization;
    28 using HeuristicLab.Core;
     27using HeuristicLab.Parameters;
    2928using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3229
    3330namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    … …  
    4138    protected override IPermutationMoveOperator PermutationMoveOperatorParameter {
    4239      get { return TranslocationMoveGeneratorParameter.Value; }
    43       set { 
     40      set {
    4441        TranslocationMoveGeneratorParameter.Value = value as TranslocationMoveGenerator;
    4542        if (TranslocationMoveGeneratorParameter.Value is IMultiMoveGenerator) {
    … …  
    7168    }
    7269
    73     public AlbaTranslocationMoveGenerator(): base() {
    74       Parameters.Add(new ValueLookupParameter<TranslocationMoveGenerator>("TranslocationMoveGenerator", "The move generator.",
     70    public AlbaTranslocationMoveGenerator()
     71      : base() {
     72      Parameters.Add(new ValueLookupParameter<TranslocationMoveGenerator>("TranslocationMoveGenerator", "The move generator.",
    7573        new StochasticTranslocationMultiMoveGenerator()));
    7674      Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
    … …  
    9391          if (move != null) {
    9492            bool criteria1 = true;
    95             if(move.Index1 - 1 >= 0 &&
    96               move.Index3 -1 >= 0)
     93            if (move.Index1 - 1 >= 0 &&
     94              move.Index3 - 1 >= 0)
    9795              criteria1 = (permutation[move.Index1] >= cities &&
    9896                permutation[move.Index1 - 1] >= cities &&
    … …  
    107105                permutation[index3] >= cities);
    108106
    109             if(criteria1 && criteria2)
     107            if (criteria1 && criteria2)
    110108              toBeDeleted.Add(scope);
    111109          }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

    r4047 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
     23using HeuristicLab.Data;
    2624using HeuristicLab.Encodings.PermutationEncoding;
    2725using HeuristicLab.Optimization;
    28 using HeuristicLab.Core;
    2926using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3227
    3328namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs

    r4047 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
     23using HeuristicLab.Data;
    2624using HeuristicLab.Encodings.PermutationEncoding;
    2725using HeuristicLab.Optimization;
    28 using HeuristicLab.Core;
    2926using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3227
    3328namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    … …  
    5752    }
    5853
    59     public AlbaTranslocationMoveMaker(): base() {
     54    public AlbaTranslocationMoveMaker()
     55      : base() {
    6056      moveMaker = new TranslocationMoveMaker();
    6157    }

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

    r4047 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
     23using HeuristicLab.Data;
    2624using HeuristicLab.Encodings.PermutationEncoding;
    2725using HeuristicLab.Optimization;
    28 using HeuristicLab.Core;
    2926using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3227
    3328namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {

  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

    r4047 r4068  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.Core;
     23using HeuristicLab.Data;
    2624using HeuristicLab.Encodings.PermutationEncoding;
    2725using HeuristicLab.Optimization;
    28 using HeuristicLab.Core;
    2926using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3227
    3328namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
Note: See TracChangeset for help on using the changeset viewer.