Free cookie consent management tool by TermsFeed Policy Generator

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/HeuristicLab.Problems.Programmable/3.3
Files:
2 deleted
5 edited
8 copied

Legend:

Unmodified
Added
Removed
  • 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                }
Note: See TracChangeset for help on using the changeset viewer.