Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/21/15 10:39:50 (9 years ago)
Author:
abeham
Message:

#2205:

  • changed branch to build to trunk
  • Reintegrated distributed additions to Core, Operators, etc. into Networks plugin
Location:
branches/OptimizationNetworks/HeuristicLab.Networks/3.3
Files:
4 added
2 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/HeuristicLab.Networks-3.3.csproj

    r11823 r12232  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\bin\</OutputPath>
     20    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    8080  </PropertyGroup>
    8181  <ItemGroup>
     82    <Reference Include="HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3">
     83      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.dll</HintPath>
     84      <Private>False</Private>
     85    </Reference>
     86    <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3">
     87      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
     88      <Private>False</Private>
     89    </Reference>
     90    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     91      <SpecificVersion>False</SpecificVersion>
     92      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     93      <Private>False</Private>
     94    </Reference>
     95    <Reference Include="HeuristicLab.Collections-3.3">
     96      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Common-3.3">
     100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     101      <Private>False</Private>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Core-3.3">
     104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     105      <Private>False</Private>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Data-3.3">
     108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     109      <Private>False</Private>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
     112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
     113      <Private>False</Private>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     117      <Private>False</Private>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="HeuristicLab.Operators-3.3">
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Optimization-3.3">
     128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     129      <Private>False</Private>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     132      <SpecificVersion>False</SpecificVersion>
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Persistence-3.3">
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     145      <SpecificVersion>False</SpecificVersion>
     146      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     147      <Private>False</Private>
     148    </Reference>
     149    <Reference Include="HeuristicLab.Problems.Knapsack-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     150      <SpecificVersion>False</SpecificVersion>
     151      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Knapsack-3.3.dll</HintPath>
     152      <Private>False</Private>
     153    </Reference>
     154    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     155      <SpecificVersion>False</SpecificVersion>
     156      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
     157      <Private>False</Private>
     158    </Reference>
     159    <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     160      <SpecificVersion>False</SpecificVersion>
     161      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
     162      <Private>False</Private>
     163    </Reference>
     164    <Reference Include="HeuristicLab.Selection-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     165      <SpecificVersion>False</SpecificVersion>
     166      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
     167      <Private>False</Private>
     168    </Reference>
    82169    <Reference Include="System" />
    83170    <Reference Include="System.Core" />
    … …  
    107194    <EmbeddedResource Include="KSPTSPNetworkCode.cs" />
    108195    <EmbeddedResource Include="KSPTSPConcurrentControlNetworkCode.cs" />
     196    <Compile Include="Core\IConnectablePort.cs" />
     197    <Compile Include="Core\IMessage.cs" />
     198    <Compile Include="Core\IMessagePort.cs" />
     199    <Compile Include="Core\IMessageValue.cs" />
     200    <Compile Include="Core\INetwork.cs" />
     201    <Compile Include="Core\INetworkItem.cs" />
     202    <Compile Include="Core\INode.cs" />
     203    <Compile Include="Core\IParameterizedPort.cs" />
     204    <Compile Include="Core\IPort.cs" />
     205    <Compile Include="Core\IPortParameter.cs" />
     206    <Compile Include="Core\Message.cs" />
     207    <Compile Include="Core\MessageCollection.cs" />
     208    <Compile Include="Core\MessagePort.cs" />
     209    <Compile Include="Core\MessageValue.cs" />
     210    <Compile Include="Core\MessageValueCollection.cs" />
     211    <Compile Include="Core\Network.cs" />
     212    <Compile Include="Core\NetworkItem.cs" />
     213    <Compile Include="Core\Node.cs" />
     214    <Compile Include="Core\NodeCollection.cs" />
     215    <Compile Include="Core\ParameterizedPort.cs" />
     216    <Compile Include="Core\Port.cs" />
     217    <Compile Include="Core\PortCollection.cs" />
     218    <Compile Include="Core\PortParameter.cs" />
     219    <Compile Include="Core\PortParameterCollection.cs" />
     220    <Compile Include="Core\PortParameterType.cs" />
     221    <Compile Include="Operators\HookOperator.cs" />
     222    <Compile Include="Operators\IHookOperator.cs" />
    109223    <Compile Include="Plugin.cs" />
    110224    <Compile Include="Programmable\IProgrammableNetwork.cs" />
    … …  
    122236    <Compile Include="Programmable\UserDefinedNode.cs" />
    123237    <Compile Include="Properties\AssemblyInfo.cs" />
     238    <Compile Include="Scripting\IProgrammableItem.cs" />
    124239    <Compile Include="UserDefinedMessagePort.cs" />
    125240  </ItemGroup>
    … …  
    130245  </ItemGroup>
    131246  <ItemGroup>
    132     <ProjectReference Include="..\..\HeuristicLab.Algorithms.GeneticAlgorithm\3.3\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj">
    133       <Project>{a51da44f-cb35-4f6f-99f5-2a2e904ab93b}</Project>
    134       <Name>HeuristicLab.Algorithms.GeneticAlgorithm-3.3</Name>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.Algorithms.LocalSearch\3.3\HeuristicLab.Algorithms.LocalSearch-3.3.csproj">
    137       <Project>{4ae3fc69-c575-42d2-bc46-0fad5850efc5}</Project>
    138       <Name>HeuristicLab.Algorithms.LocalSearch-3.3</Name>
    139     </ProjectReference>
    140     <ProjectReference Include="..\..\HeuristicLab.Algorithms.VariableNeighborhoodSearch\3.3\HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj">
    141       <Project>{e4cfb0c3-0589-4893-b38e-8bedf885c765}</Project>
    142       <Name>HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3</Name>
    143     </ProjectReference>
    144     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    145       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
    146       <Name>HeuristicLab.Analysis-3.3</Name>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    149       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
    150       <Name>HeuristicLab.Collections-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153247    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    154248      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
    155249      <Name>HeuristicLab.Common.Resources-3.3</Name>
    156250      <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    159       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    160       <Name>HeuristicLab.Common-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    164       <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    165       <Name>HeuristicLab.Core-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    169       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    170       <Name>HeuristicLab.Data-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173     <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
    174       <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
    175       <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
    176     </ProjectReference>
    177     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    178       <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
    179       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    180     </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    182       <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
    183       <Name>HeuristicLab.Operators-3.3</Name>
    184       <Private>False</Private>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    187       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    188       <Name>HeuristicLab.Optimization-3.3</Name>
    189       <Private>False</Private>
    190     </ProjectReference>
    191     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    192       <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
    193       <Name>HeuristicLab.Parameters-3.3</Name>
    194       <Private>False</Private>
    195     </ProjectReference>
    196     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    197       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
    198       <Name>HeuristicLab.Persistence-3.3</Name>
    199       <Private>False</Private>
    200     </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    202       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    203       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    204       <Private>False</Private>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    207       <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
    208       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Problems.Knapsack\3.3\HeuristicLab.Problems.Knapsack-3.3.csproj">
    211       <Project>{e10f395f-c8a6-48ad-b470-9aa7a1f43809}</Project>
    212       <Name>HeuristicLab.Problems.Knapsack-3.3</Name>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    215       <Project>{d767c38d-8014-46b0-9a32-03a3aecce34a}</Project>
    216       <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
    219       <Project>{21977cc3-1757-4b3b-87bd-ff817aaa900f}</Project>
    220       <Name>HeuristicLab.Scripting-3.3</Name>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    223       <Project>{2c36cd4f-e5f5-43a4-801a-201ea895fe17}</Project>
    224       <Name>HeuristicLab.Selection-3.3</Name>
    225251    </ProjectReference>
    226252  </ItemGroup>

  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Plugin.cs.frame

    r11577 r12232  
    3333  [PluginDependency("HeuristicLab.Core", "3.3")]
    3434  [PluginDependency("HeuristicLab.Data", "3.3")]
     35  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
     36  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
    3537  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3638  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    37   [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3839  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3940  [PluginDependency("HeuristicLab.Scripting", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.