Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11949


Ignore:
Timestamp:
02/06/15 14:42:48 (9 years ago)
Author:
mkommend
Message:

#2174: Distributed files in programmable problem branch to the correct plugins.

Location:
branches/ProgrammableProblem
Files:
1 added
2 deleted
41 edited
17 copied
3 moved

Legend:

Unmodified
Added
Removed

  • branches/ProgrammableProblem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs

    r11945 r11949  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Encodings.BinaryVectorEncoding;
     28using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.PluginInfrastructure;
    3232
    33 namespace HeuristicLab.Problems.Programmable {
     33namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    3434  [Item("BinaryVectorEncoding", "Describes a binary vector encoding.")]
    3535  [StorableClass]
    … …  
    5252    }
    5353    #endregion
     54
    5455
    5556    public int Length {
    … …  
    165166    #endregion
    166167  }
     168
     169  public static class IndividualExtensionMethods {
     170    public static BinaryVector BinaryVector(this Individual individual) {
     171      var encoding = individual.GetEncoding<BinaryVectorEncoding>();
     172      return individual.BinaryVector(encoding.Name);
     173    }
     174
     175    public static BinaryVector BinaryVector(this Individual individual, string name) {
     176      return (BinaryVector)individual[name];
     177    }
     178  }
    167179}

  • branches/ProgrammableProblem/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

    r11778 r11949  
    155155  </ItemGroup>
    156156  <ItemGroup>
     157    <Compile Include="BinaryVectorEncoding.cs" />
    157158    <Compile Include="Creators\RandomBinaryVectorCreator.cs" />
    158159    <Compile Include="Crossovers\MultiBinaryVectorCrossover.cs" />

  • branches/ProgrammableProblem/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj

    r11778 r11949  
    169169    </Compile>
    170170    <Compile Include="Crossovers\RoundedUniformArithmeticCrossover.cs" />
     171    <Compile Include="IntegerVectorEncoding.cs" />
    171172    <Compile Include="IntegerVectorOperator.cs" />
    172173    <Compile Include="Interfaces\IBoundedIntegerVectorOperator.cs" />

  • branches/ProgrammableProblem/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs

    r11945 r11949  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Encodings.IntegerVectorEncoding;
    2928using HeuristicLab.Optimization;
    3029using HeuristicLab.Parameters;
    … …  
    3231using HeuristicLab.PluginInfrastructure;
    3332
    34 namespace HeuristicLab.Problems.Programmable {
     33namespace HeuristicLab.Encodings.IntegerVectorEncoding {
    3534  [Item("IntegerVectorEncoding", "Describes an integer vector encoding.")]
    3635  [StorableClass]
    … …  
    270269    #endregion
    271270  }
     271
     272  public static class IndividualExtensionMethods {
     273    public static IntegerVector IntegerVector(this Individual individual) {
     274      var encoding = individual.GetEncoding<IntegerVectorEncoding>();
     275      return individual.IntegerVector(encoding.Name);
     276    }
     277    public static IntegerVector IntegerVector(this Individual individual, string name) {
     278      return (IntegerVector)individual[name];
     279    }
     280  }
    272281}

  • branches/ProgrammableProblem/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

    r11778 r11949  
    233233    <Compile Include="Moves\TwoOpt\StochasticInversionMultiMoveGenerator.cs" />
    234234    <Compile Include="Moves\TwoOpt\StochasticInversionSingleMoveGenerator.cs" />
     235    <Compile Include="PermutationEncoding.cs" />
    235236    <Compile Include="PermutationEqualityComparer.cs" />
    236237    <Compile Include="PermutationManipulator.cs" />

  • branches/ProgrammableProblem/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.cs

    r11945 r11949  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Runtime.InteropServices;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Data;
    29 using HeuristicLab.Encodings.PermutationEncoding;
     28using HeuristicLab.Optimization;
    3029using HeuristicLab.Parameters;
    3130using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3231using HeuristicLab.PluginInfrastructure;
    3332
    34 namespace HeuristicLab.Problems.Programmable {
     33namespace HeuristicLab.Encodings.PermutationEncoding {
    3534  [Item("PermutationEncoding", "Describes a permutation encoding.")]
    3635  [StorableClass]
    … …  
    225224    #endregion
    226225  }
     226
     227  public static class IndividualExtensionMethods {
     228    public static Permutation Permutation(this Individual individual) {
     229      var encoding = individual.GetEncoding<PermutationEncoding>();
     230      return individual.Permutation(encoding.Name);
     231    }
     232    public static Permutation Permutation(this Individual individual, string name) {
     233      return (Permutation)individual[name];
     234    }
     235  }
    227236}

  • branches/ProgrammableProblem/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

    r11778 r11949  
    176176    <Compile Include="RealVectorCrossover.cs" />
    177177    <Compile Include="Properties\AssemblyInfo.cs" />
     178    <Compile Include="RealVectorEncoding.cs" />
    178179    <Compile Include="RealVectorManipulator.cs" />
    179180  </ItemGroup>

  • branches/ProgrammableProblem/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs

    r11945 r11949  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Encodings.RealVectorEncoding;
    2928using HeuristicLab.Optimization;
    3029using HeuristicLab.Parameters;
    … …  
    3231using HeuristicLab.PluginInfrastructure;
    3332
    34 namespace HeuristicLab.Problems.Programmable {
     33namespace HeuristicLab.Encodings.RealVectorEncoding {
    3534  [Item("RealVectorEncoding", "Describes a real vector encoding.")]
    3635  [StorableClass]
    … …  
    317316    #endregion
    318317  }
     318
     319  public static class IndividualExtensionMethods {
     320    public static RealVector RealVector(this Individual individual) {
     321      var encoding = individual.GetEncoding<RealVectorEncoding>();
     322      return individual.RealVector(encoding.Name);
     323    }
     324    public static RealVector RealVector(this Individual individual, string name) {
     325      return (RealVector)individual[name];
     326    }
     327  }
    319328}

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

    r11945 r11949  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    2928using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3029
    31 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3231  [StorableClass]
    3332  public abstract class BasicProblem<TEncoding, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator>, IProblemDefinition, IStorableContent

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

    r11945 r11949  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3131  [Item("Encoding", "Base class for describing different encodings.")]
    3232  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/Individual.cs

    r11885 r11949  
    2222using System;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.BinaryVectorEncoding;
    25 using HeuristicLab.Encodings.IntegerVectorEncoding;
    26 using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Encodings.RealVectorEncoding;
    2824
    29 namespace HeuristicLab.Problems.Programmable {
     25namespace HeuristicLab.Optimization {
    3026  public abstract class Individual {
    3127    protected IEncoding Encoding { get; private set; }
    … …  
    6157    }
    6258  }
    63 
    64   #region extension methods
    65   public static class IndividualExtensionMethods {
    66     public static BinaryVector BinaryVector(this Individual individual) {
    67       var encoding = individual.GetEncoding<BinaryVectorEncoding>();
    68       return individual.BinaryVector(encoding.Name);
    69     }
    70     public static BinaryVector BinaryVector(this Individual individual, string name) {
    71       return (BinaryVector)individual[name];
    72     }
    73 
    74     public static IntegerVector IntegerVector(this Individual individual) {
    75       var encoding = individual.GetEncoding<IntegerVectorEncoding>();
    76       return individual.IntegerVector(encoding.Name);
    77     }
    78     public static IntegerVector IntegerVector(this Individual individual, string name) {
    79       return (IntegerVector)individual[name];
    80     }
    81 
    82     public static Permutation Permutation(this Individual individual) {
    83       var encoding = individual.GetEncoding<PermutationEncoding>();
    84       return individual.Permutation(encoding.Name);
    85     }
    86     public static Permutation Permutation(this Individual individual, string name) {
    87       return (Permutation)individual[name];
    88     }
    89 
    90     public static RealVector RealVector(this Individual individual) {
    91       var encoding = individual.GetEncoding<RealVectorEncoding>();
    92       return individual.RealVector(encoding.Name);
    93     }
    94     public static RealVector RealVector(this Individual individual, string name) {
    95       return (RealVector)individual[name];
    96     }
    97   }
    98   #endregion
    9959}

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiEncodingIndividual.cs

    r11885 r11949  
    2626using HeuristicLab.Core;
    2727
    28 namespace HeuristicLab.Problems.Programmable {
     28namespace HeuristicLab.Optimization {
    2929  public sealed class MultiEncodingIndividual : Individual {
    3030    private new MultiEncoding Encoding {

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/SingleEncodingIndividual.cs

    r11885 r11949  
    2424using HeuristicLab.Core;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  public sealed class SingleEncodingIndividual : Individual {
    2828    public SingleEncodingIndividual(IEncoding encoding, IScope scope)

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncoding.cs

    r11753 r11949  
    2525using HeuristicLab.Optimization;
    2626
    27 namespace HeuristicLab.Problems.Programmable {
     27namespace HeuristicLab.Optimization {
    2828  public interface IEncoding : IParameterizedNamedItem {
    2929    ISolutionCreator SolutionCreator { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncodingOperator.cs

    r11739 r11949  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.Programmable {
     24namespace HeuristicLab.Optimization {
    2525  public interface IEncodingOperator : IOperator {
    2626    ILookupParameter<IEncoding> EncodingParameter { get; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiEncodingOperator.cs

    r11885 r11949  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.Programmable {
     24namespace HeuristicLab.Optimization {
    2525  public interface IMultiEncodingOperator : IOperator {
    2626    void AddEncoding(IEncoding encoding);

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

    r11880 r11949  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Problems.Programmable {
     25namespace HeuristicLab.Optimization {
    2626  public interface IMultiObjectiveProblemDefinition : IProblemDefinition {
    2727    bool[] Maximization { get; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs

    r11768 r11949  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.Programmable {
     24namespace HeuristicLab.Optimization {
    2525  public interface IProblemDefinition {
    2626    IEncoding Encoding { get; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveMoveOperator.cs

    r11753 r11949  
    2121using HeuristicLab.Optimization;
    2222
    23 namespace HeuristicLab.Problems.Programmable {
     23namespace HeuristicLab.Optimization {
    2424  public interface ISingleObjectiveMoveOperator : IMoveOperator {
    2525  }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

    r11880 r11949  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  public interface ISingleObjectiveProblemDefinition : IProblemDefinition {
    2828    bool Maximization { get; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveAnalysisOperator.cs

    r11880 r11949  
    2222using System;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Optimization;
    2524
    26 namespace HeuristicLab.Problems.Programmable {
     25namespace HeuristicLab.Optimization {
    2726  internal interface IMultiObjectiveAnalysisOperator : IEncodingOperator, IAnalyzer {
    2827    Action<Individual[], double[][], ResultCollection, IRandom> AnalyzeAction { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs

    r11740 r11949  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  internal interface IMultiObjectiveEvaluationOperator : IMultiObjectiveEvaluator, IEncodingOperator {
    2828    Func<Individual, IRandom, double[]> EvaluateFunc { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/INeighborBasedOperator.cs

    r11739 r11949  
    2424using HeuristicLab.Core;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  internal interface INeighborBasedOperator : IEncodingOperator {
    2828    Func<Individual, IRandom, IEnumerable<Individual>> GetNeighborsFunc { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs

    r11880 r11949  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  internal interface ISingleObjectiveAnalysisOperator : IEncodingOperator {
    2828    Action<Individual[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

    r11739 r11949  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2727  internal interface ISingleObjectiveEvaluationOperator : ISingleObjectiveEvaluator, IEncodingOperator {
    2828    Func<Individual, IRandom, double> EvaluateFunc { get; set; }

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/MultiEncoding.cs

    r11945 r11949  
    2828using HeuristicLab.PluginInfrastructure;
    2929
    30 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3131  [Item("MultiEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
    3232  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

    r11945 r11949  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Optimization;
    2726using HeuristicLab.Parameters;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928
    30 namespace HeuristicLab.Problems.Programmable {
     29namespace HeuristicLab.Optimization {
    3130  [StorableClass]
    3231  public abstract class MultiObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, MultiObjectiveEvaluator>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

    r11797 r11949  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Optimization;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2827
    29 namespace HeuristicLab.Problems.Programmable {
     28namespace HeuristicLab.Optimization {
    3029  [Item("MultiEncodingCreator", "Contains solution creators that together create a multi-encoding.")]
    3130  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs

    r11797 r11949  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Optimization;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2625
    27 namespace HeuristicLab.Problems.Programmable {
     26namespace HeuristicLab.Optimization {
    2827  [Item("MultiEncoding Crossover", "Applies different crossovers to cross a multi-encoding.")]
    2928  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs

    r11797 r11949  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    27 namespace HeuristicLab.Problems.Programmable {
     27namespace HeuristicLab.Optimization {
    2828  [Item("MultiEncoding Manipulator", "Applies different manipulators to change a multi-encoding.")]
    2929  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs

    r11885 r11949  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3131  [StorableClass]
    3232  public abstract class MultiEncodingOperator<T> : Operator, IMultiEncodingOperator where T : class,IOperator {

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveAnalyzer.cs

    r11880 r11949  
    1010using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1111
    12 namespace HeuristicLab.Problems.Programmable {
     12namespace HeuristicLab.Optimization {
    1313  [Item("Multi-objective Analyzer", "Calls the Analyze method of the problem definition.")]
    1414  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

    r11740 r11949  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    31 namespace HeuristicLab.Problems.Programmable {
     31namespace HeuristicLab.Optimization {
    3232  [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
    3333  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveAnalyzer.cs

    r11880 r11949  
    1010using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1111
    12 namespace HeuristicLab.Problems.Programmable {
     12namespace HeuristicLab.Optimization {
    1313  [Item("Single-objective Analyzer", "Calls the script's Analyze method to be able to write into the results collection.")]
    1414  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

    r11739 r11949  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    31 namespace HeuristicLab.Problems.Programmable {
     31namespace HeuristicLab.Optimization {
    3232  [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
    3333  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

    r11885 r11949  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    33 namespace HeuristicLab.Problems.Programmable {
     33namespace HeuristicLab.Optimization {
    3434  [Item("Single-objective Improver", "Improves a solution by calling GetNeighbors and Evaluate of the corresponding problem definition.")]
    3535  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs

    r11753 r11949  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    31 namespace HeuristicLab.Problems.Programmable {
     31namespace HeuristicLab.Optimization {
    3232  [Item("Single-objective MoveEvaluator", "Evaluates a parameter vector that results from a move.")]
    3333  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveGenerator.cs

    r11885 r11949  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    34 namespace HeuristicLab.Problems.Programmable {
     34namespace HeuristicLab.Optimization {
    3535  [Item("Single-objective MoveGenerator", "Calls the GetNeighbors method of the problem definition to obtain the moves.")]
    3636  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveMaker.cs

    r11885 r11949  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Operators;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    2928using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3029
    31 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3231  [Item("Single-objective MoveMaker", "Applies a move.")]
    3332  [StorableClass]

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

    r11945 r11949  
    2222using System.Collections.Generic;
    2323using System.Linq;
    24 using HeuristicLab.Analysis;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    2726using HeuristicLab.Data;
    28 using HeuristicLab.Optimization;
    2927using HeuristicLab.Parameters;
    3028using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3129
    32 namespace HeuristicLab.Problems.Programmable {
     30namespace HeuristicLab.Optimization {
    3331  [StorableClass]
    3432  public abstract class SingleObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, SingleObjectiveEvaluator>,
    … …  
    4947
    5048      Operators.Add(Evaluator);
    51       Operators.Add(new BestScopeSolutionAnalyzer());
    5249      Operators.Add(new SingleObjectiveAnalyzer());
    5350      Operators.Add(new SingleObjectiveImprover());

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r11812 r11949  
    125125      <Private>False</Private>
    126126    </Reference>
     127    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     128      <SpecificVersion>False</SpecificVersion>
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     130    </Reference>
    127131    <Reference Include="HeuristicLab.Parameters-3.3">
    128132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    … …  
    153157  <ItemGroup>
    154158    <Compile Include="Algorithms\BasicAlgorithm.cs" />
     159    <Compile Include="BasicProblems\BasicProblem.cs" />
     160    <Compile Include="BasicProblems\Encoding.cs" />
     161    <Compile Include="BasicProblems\Individuals\Individual.cs" />
     162    <Compile Include="BasicProblems\Individuals\MultiEncodingIndividual.cs" />
     163    <Compile Include="BasicProblems\Individuals\SingleEncodingIndividual.cs" />
     164    <Compile Include="BasicProblems\Interfaces\IEncoding.cs" />
     165    <Compile Include="BasicProblems\Interfaces\IEncodingOperator.cs" />
     166    <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
     167    <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblemDefinition.cs" />
     168    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveAnalysisOperator.cs" />
     169    <Compile Include="BasicProblems\Interfaces\internal\IMultiObjectiveEvaluationOperator.cs" />
     170    <Compile Include="BasicProblems\Interfaces\internal\INeighborBasedOperator.cs" />
     171    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveAnalysisOperator.cs" />
     172    <Compile Include="BasicProblems\Interfaces\internal\ISingleObjectiveEvaluationOperator.cs" />
     173    <Compile Include="BasicProblems\Interfaces\IProblemDefinition.cs" />
     174    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveMoveOperator.cs" />
     175    <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblemDefinition.cs" />
     176    <Compile Include="BasicProblems\MultiEncoding.cs" />
     177    <Compile Include="BasicProblems\MultiObjectiveBasicProblem.cs" />
     178    <Compile Include="BasicProblems\Operators\MultiEncodingCreator.cs" />
     179    <Compile Include="BasicProblems\Operators\MultiEncodingCrossover.cs" />
     180    <Compile Include="BasicProblems\Operators\MultiEncodingManipulator.cs" />
     181    <Compile Include="BasicProblems\Operators\MultiEncodingOperator.cs" />
     182    <Compile Include="BasicProblems\Operators\MultiObjectiveAnalyzer.cs" />
     183    <Compile Include="BasicProblems\Operators\MultiObjectiveEvaluator.cs" />
     184    <Compile Include="BasicProblems\Operators\SingleObjectiveAnalyzer.cs" />
     185    <Compile Include="BasicProblems\Operators\SingleObjectiveEvaluator.cs" />
     186    <Compile Include="BasicProblems\Operators\SingleObjectiveImprover.cs" />
     187    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveEvaluator.cs" />
     188    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveGenerator.cs" />
     189    <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
     190    <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
    155191    <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
    156192    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />

  • branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/Plugin.cs.frame

    r11174 r11949  
    3333  [PluginDependency("HeuristicLab.Core", "3.3")]
    3434  [PluginDependency("HeuristicLab.Data", "3.3")]
     35  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3536  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3637  [PluginDependency("HeuristicLab.Persistence", "3.3")]

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/CreateNewSingleEncodingDialog.cs

    r11892 r11949  
    2323using System.Collections.Generic;
    2424using System.Windows.Forms;
     25using HeuristicLab.Optimization;
    2526using HeuristicLab.PluginInfrastructure;
    2627

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable.Views/3.3/MultiEncodingView.cs

    r11892 r11949  
    2828using HeuristicLab.Core.Views;
    2929using HeuristicLab.MainForm;
     30using HeuristicLab.Optimization;
    3031
    3132namespace HeuristicLab.Problems.Programmable.Views {
    … …  
    8182          try {
    8283            encoding = (IEncoding)Activator.CreateInstance(dialog.EncodingType, dialog.EncodingName);
    83           } catch (MissingMethodException mmex) {
     84          }
     85          catch (MissingMethodException mmex) {
    8486            PluginInfrastructure.ErrorHandling.ShowErrorDialog(
    8587              "The encoding must have a constructor that takes the name as a single string argument", mmex);
    8688            return;
    87           } catch (TargetInvocationException tiex) {
     89          }
     90          catch (TargetInvocationException tiex) {
    8891            PluginInfrastructure.ErrorHandling.ShowErrorDialog("The encoding could not be created due to an error in the constructor.", tiex);
    8992            return;
    90           } catch (MethodAccessException maex) {
     93          }
     94          catch (MethodAccessException maex) {
    9195            PluginInfrastructure.ErrorHandling.ShowErrorDialog("The encoding's string constructor is not public.", maex);
    9296            return;

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/CompiledProblemDefinition.cs

    r11945 r11949  
    2121
    2222using System;
     23using HeuristicLab.Optimization;
    2324
    2425namespace HeuristicLab.Problems.Programmable {

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r11885 r11949  
    4040  </PropertyGroup>
    4141  <ItemGroup>
    42     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    43       <SpecificVersion>False</SpecificVersion>
    44       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    45       <Private>False</Private>
    46     </Reference>
    4742    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4843      <SpecificVersion>False</SpecificVersion>
    … …  
    5550      <Private>False</Private>
    5651    </Reference>
    57     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    58       <SpecificVersion>False</SpecificVersion>
    59       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    60       <Private>False</Private>
    61     </Reference>
    6252    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6353      <SpecificVersion>False</SpecificVersion>
    … …  
    6858      <SpecificVersion>False</SpecificVersion>
    6959      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    70       <Private>False</Private>
    71     </Reference>
    72     <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    73       <SpecificVersion>False</SpecificVersion>
    74       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
    75       <Private>False</Private>
    76     </Reference>
    77     <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    78       <SpecificVersion>False</SpecificVersion>
    79       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
    80       <Private>False</Private>
    81     </Reference>
    82     <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    83       <SpecificVersion>False</SpecificVersion>
    84       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    85       <Private>False</Private>
    86     </Reference>
    87     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    88       <SpecificVersion>False</SpecificVersion>
    89       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    90       <Private>False</Private>
    9160    </Reference>
    9261    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    … …  
    10978      <Private>False</Private>
    11079    </Reference>
    111     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112       <SpecificVersion>False</SpecificVersion>
    113       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    114       <Private>False</Private>
    115     </Reference>
    11680    <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    11781      <SpecificVersion>False</SpecificVersion>
    … …  
    12993  </ItemGroup>
    13094  <ItemGroup>
    131     <Compile Include="Individuals\MultiEncodingIndividual.cs" />
    132     <Compile Include="Encodings\PermutationEncoding.cs" />
    133     <Compile Include="Encodings\RealVectorEncoding.cs" />
    134     <Compile Include="Encodings\IntegerVectorEncoding.cs" />
    135     <Compile Include="Encodings\BinaryVectorEncoding.cs" />
    136     <Compile Include="Encodings\MultiEncoding.cs" />
    137     <Compile Include="Encodings\Encoding.cs" />
    138     <Compile Include="Individuals\Individual.cs" />
    139     <Compile Include="Individuals\SingleEncodingIndividual.cs" />
    140     <Compile Include="Interfaces\IEncoding.cs" />
    141     <Compile Include="Interfaces\IMultiEncodingOperator.cs" />
    142     <Compile Include="Interfaces\internal\INeighborBasedOperator.cs" />
    143     <Compile Include="Interfaces\internal\IMultiObjectiveAnalysisOperator.cs" />
    144     <Compile Include="Interfaces\internal\ISingleObjectiveAnalysisOperator.cs" />
    145     <Compile Include="Interfaces\internal\IMultiObjectiveEvaluationOperator.cs" />
    146     <Compile Include="Interfaces\internal\ISingleObjectiveEvaluationOperator.cs" />
    147     <Compile Include="Interfaces\IMultiObjectiveProblemDefinition.cs" />
    148     <Compile Include="Interfaces\IEncodingOperator.cs" />
    149     <Compile Include="Interfaces\ISingleObjectiveMoveOperator.cs" />
    150     <Compile Include="New\BasicProblem.cs" />
    151     <Compile Include="New\MultiObjectiveBasicProblem.cs" />
    152     <Compile Include="New\MultiObjectiveProgrammableProblem.cs" />
    153     <Compile Include="New\Scripts\ProblemDefinitionScriptException.cs" />
    154     <Compile Include="New\Scripts\Templates\CompiledMultiObjectiveProblemDefinition.cs" />
    155     <Compile Include="New\Scripts\Templates\CompiledSingleObjectiveProblemDefinition.cs" />
    156     <Compile Include="New\Scripts\Templates\ScriptTemplates.Designer.cs">
     95    <Compile Include="MultiObjectiveProgrammableProblem.cs" />
     96    <Compile Include="ProblemDefinitionScriptException.cs" />
     97    <Compile Include="Templates\CompiledMultiObjectiveProblemDefinition.cs" />
     98    <Compile Include="Templates\CompiledSingleObjectiveProblemDefinition.cs" />
     99    <Compile Include="Templates\ScriptTemplates.Designer.cs">
    157100      <AutoGen>True</AutoGen>
    158101      <DesignTime>True</DesignTime>
    159102      <DependentUpon>ScriptTemplates.resx</DependentUpon>
    160103    </Compile>
    161     <Compile Include="Operators\MultiEncodingManipulator.cs" />
    162     <Compile Include="Operators\MultiEncodingCrossover.cs" />
    163     <Compile Include="Operators\MultiEncodingOperator.cs" />
    164     <Compile Include="Operators\SingleObjectiveMoveEvaluator.cs" />
    165     <Compile Include="Operators\SingleObjectiveMoveGenerator.cs" />
    166     <Compile Include="Operators\SingleObjectiveMoveMaker.cs" />
    167     <Compile Include="Operators\MultiObjectiveAnalyzer.cs" />
    168     <Compile Include="Operators\SingleObjectiveAnalyzer.cs" />
    169     <Compile Include="Operators\MultiObjectiveEvaluator.cs" />
    170     <Compile Include="Operators\SingleObjectiveEvaluator.cs" />
    171     <Compile Include="Operators\MultiEncodingCreator.cs" />
    172     <Compile Include="Interfaces\IProblemDefinition.cs" />
    173     <Compile Include="Interfaces\ISingleObjectiveProblemDefinition.cs" />
    174     <Compile Include="Operators\SingleObjectiveImprover.cs" />
    175     <Compile Include="New\Scripts\CompiledProblemDefinition.cs" />
    176     <Compile Include="New\Scripts\ProblemDefinitionScript.cs" />
    177     <Compile Include="New\OneMaxNew.cs" />
    178     <Compile Include="New\SingleObjectiveBasicProblem.cs" />
    179     <Compile Include="New\SingleObjectiveProgrammableProblem.cs" />
    180     <Compile Include="New\Scripts\MultiObjectiveProblemDefinitionScript.cs" />
    181     <Compile Include="New\Scripts\SingleObjectiveProblemDefinitionScript.cs" />
    182     <EmbeddedResource Include="New\Scripts\Templates\ScriptTemplates.resx">
     104    <Compile Include="CompiledProblemDefinition.cs" />
     105    <Compile Include="ProblemDefinitionScript.cs" />
     106    <Compile Include="SingleObjectiveProgrammableProblem.cs" />
     107    <Compile Include="MultiObjectiveProblemDefinitionScript.cs" />
     108    <Compile Include="SingleObjectiveProblemDefinitionScript.cs" />
     109    <EmbeddedResource Include="Templates\ScriptTemplates.resx">
    183110      <Generator>ResXFileCodeGenerator</Generator>
    184111      <LastGenOutput>ScriptTemplates.Designer.cs</LastGenOutput>
    … …  
    191118  </ItemGroup>
    192119  <ItemGroup>
     120    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
     121      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
     122      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
     123    </ProjectReference>
     124    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
     125      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
     126      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
     127    </ProjectReference>
     128    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     129      <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
     130      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     131    </ProjectReference>
     132    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     133      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
     134      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     135    </ProjectReference>
    193136    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    194137      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    … …  
    196139    </ProjectReference>
    197140  </ItemGroup>
     141  <ItemGroup />
    198142  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    199143  <PropertyGroup>

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

    r10850 r11949  
    2525  [Plugin("HeuristicLab.Problems.Programmable", "Programmable problem for defining custom representation and evaluation function.", "3.3.9.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.Programmable-3.3.dll", PluginFileType.Assembly)]
    27   [PluginDependency("HeuristicLab.Analysis", "3.3")]
    2827  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2928  [PluginDependency("HeuristicLab.Common", "3.3")]
    30   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3129  [PluginDependency("HeuristicLab.Core", "3.3")]
    32   [PluginDependency("HeuristicLab.Data", "3.3")]
    33   [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
    34   [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
    35   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
    36   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    3730  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3831  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3932  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4033  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    41   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4234  [PluginDependency("HeuristicLab.Scripting", "3.3")]
    4335  public class HeuristicLabProblemsProgrammablePlugin : PluginBase { }

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

    r11945 r11949  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
     27using HeuristicLab.Optimization;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2829using HeuristicLab.Scripting;

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScriptException.cs

    r11945 r11949  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    423using System.Runtime.Serialization;
    5 using System.Text;
    6 using System.Threading.Tasks;
    724
    825namespace HeuristicLab.Problems.Programmable {

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledMultiObjectiveProblemDefinition.cs

    r11900 r11949  
    55using HeuristicLab.Core;
    66using HeuristicLab.Data;
     7using HeuristicLab.Encodings.BinaryVectorEncoding;
     8using HeuristicLab.Encodings.IntegerVectorEncoding;
    79using HeuristicLab.Encodings.PermutationEncoding;
     10using HeuristicLab.Encodings.RealVectorEncoding;
    811using HeuristicLab.Optimization;
    912using HeuristicLab.Problems.Programmable;

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Templates/CompiledSingleObjectiveProblemDefinition.cs

    r11900 r11949  
    55using HeuristicLab.Core;
    66using HeuristicLab.Data;
     7using HeuristicLab.Encodings.BinaryVectorEncoding;
     8using HeuristicLab.Encodings.IntegerVectorEncoding;
    79using HeuristicLab.Encodings.PermutationEncoding;
     10using HeuristicLab.Encodings.RealVectorEncoding;
    811using HeuristicLab.Optimization;
    912using HeuristicLab.Problems.Programmable;

  • branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Templates/ScriptTemplates.Designer.cs

    r11797 r11949  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Problems.Programmable{
     11namespace HeuristicLab.Problems.Programmable {
    1212    using System;
    1313   
    … …  
    4040            get {
    4141                if (object.ReferenceEquals(resourceMan, null)) {
    42                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Problems.Programmable.New.Scripts.Templates.ScriptTemplates", typeof(ScriptTemplates).Assembly);
     42                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HeuristicLab.Problems.Programmable.Templates.ScriptTemplates", typeof(ScriptTemplates).Assembly);
    4343                    resourceMan = temp;
    4444                }

  • branches/ProgrammableProblem/ProgrammableProblem.sln

    r11892 r11949  
    77EndProject
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Programmable.Views-3.3", "HeuristicLab.Problems.Programmable.Views\3.3\HeuristicLab.Problems.Programmable.Views-3.3.csproj", "{6F023B90-2091-40A9-8AC0-B0338DFF8E5F}"
    9 EndProject
    10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions-3.4", "HeuristicLab.Problems.TestFunctions\3.4\HeuristicLab.Problems.TestFunctions-3.4.csproj", "{88B9B0E3-344E-4196-82A3-0F9732506FE8}"
    119EndProject
    1210Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
    … …  
    5250    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Release|x64.ActiveCfg = Release|Any CPU
    5351    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Release|x86.ActiveCfg = Release|Any CPU
    54     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    55     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
    56     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x64.ActiveCfg = Debug|x64
    57     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x64.Build.0 = Debug|x64
    58     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x86.ActiveCfg = Debug|x86
    59     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x86.Build.0 = Debug|x86
    60     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
    61     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|Any CPU.Build.0 = Release|Any CPU
    62     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x64.ActiveCfg = Release|x64
    63     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x64.Build.0 = Release|x64
    64     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x86.ActiveCfg = Release|x86
    65     {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x86.Build.0 = Release|x86
    6652    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    6753    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.