Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/22/11 09:35:06 (13 years ago)
Author:
mkommend
Message:

#1479: Integrated trunk changes.

Location:
branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3
Files:
6 edited
7 copied

Legend:

Unmodified
Added
Removed

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r6042 r6675  
    111111  </ItemGroup>
    112112  <ItemGroup>
     113    <Compile Include="RunCollectionValueRemover.cs" />
     114    <Compile Include="IRunCollectionModifier.cs" />
    113115    <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
    114116    <Compile Include="Algorithms\Algorithm.cs" />
    115117    <Compile Include="BatchRun.cs" />
     118    <Compile Include="Calculator.cs" />
    116119    <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
    117120    <Compile Include="Algorithms\HeuristicOptimizationEngineAlgorithm.cs" />
    … …  
    136139    <Compile Include="Interfaces\ISingleObjectiveHeuristicOptimizationProblem.cs" />
    137140    <Compile Include="Problems\Problem.cs" />
     141    <Compile Include="RunCollectionFormulaModifer.cs" />
     142    <Compile Include="RunCollectionFuzzifier.cs" />
     143    <Compile Include="RunCollectionModificationEvaluator.cs" />
    138144    <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />
    139145    <Compile Include="RunCollectionConstraints\RunCollectionConstraintCollection.cs" />
     146    <Compile Include="RunCollectionConstraints\RunCollectionContentConstraint.cs" />
    140147    <Compile Include="RunCollectionConstraints\RunCollectionTypeCompatiblityConstraint.cs" />
    141148    <Compile Include="RunCollectionConstraints\RunCollectionEqualityConstraint.cs" />
    … …  
    244251    </BootstrapperPackage>
    245252  </ItemGroup>
     253  <ItemGroup />
    246254  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    247255  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.cs

    r5445 r6675  
    2626  public interface IRunCollectionConstraint : IConstraint {
    2727    new RunCollection ConstrainedValue { get; set; }
     28  }
     29
     30  public interface IRunCollectionColumnConstraint : IRunCollectionConstraint {
    2831    string ConstraintColumn { get; set; }
    2932    event EventHandler ConstraintColumnChanged;

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

    r5445 r6675  
    3030  [StorableClass]
    3131  [Item("RunCollectionComparisonConstraint", "A constraint which compares the members of the contained runs with the constraint data.")]
    32   public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionConstraint {
     32  public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    3434    protected RunCollectionComparisonConstraint(bool deserializing) : base(deserializing) { }

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

    r5445 r6675  
    3030  [StorableClass]
    3131  [Item("RunCollectionEqualityConstraint", "A constraint which checks the members of the contained runs for equality to the constraint data.")]
    32   public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionConstraint {
     32  public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    3434    protected RunCollectionEqualityConstraint(bool deserializing) : base(deserializing) { }

  • branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

    r5445 r6675  
    3030  [StorableClass]
    3131  [Item("RunCollectionTypeCompatibilityConstraint", "A constraint which checks the members of the contained runs for type compabitiliby to the constraint data.")]
    32   public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionConstraint {
     32  public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    3434    protected RunCollectionTypeCompatibilityConstraint(bool deserializing) {
Note: See TracChangeset for help on using the changeset viewer.