Changeset 13997


Ignore:
Timestamp:
07/05/16 11:57:18 (5 years ago)
Author:
gkronber
Message:

#2615 removed initState override and updated references to trunk

Location:
branches/thasling/DistributedGA/DistributedGA.Hive
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/thasling/DistributedGA/DistributedGA.Hive/DistributedGA.Hive.csproj

    r13957 r13997  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\..\..\stable\bin\</OutputPath>
     20    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
     
    2727    <DebugType>pdbonly</DebugType>
    2828    <Optimize>true</Optimize>
    29     <OutputPath>..\..\..\..\stable\bin\</OutputPath>
     29    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    3030    <DefineConstants>TRACE</DefineConstants>
    3131    <ErrorReport>prompt</ErrorReport>
     
    4242  </PropertyGroup>
    4343  <ItemGroup>
    44     <Reference Include="HeuristicLab.Clients.Hive-3.3">
    45       <HintPath>..\..\..\stable\bin\HeuristicLab.Clients.Hive-3.3.dll</HintPath>
    46       <Private>False</Private>
    47     </Reference>
    4844    <Reference Include="HeuristicLab.Collections-3.3">
    49       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     45      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    5046      <Private>False</Private>
    5147    </Reference>
    5248    <Reference Include="HeuristicLab.Common-3.3">
    53       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Common-3.3.dll</HintPath>
     49      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     50      <Private>False</Private>
    5451    </Reference>
    5552    <Reference Include="HeuristicLab.Core-3.3">
    56       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Core-3.3.dll</HintPath>
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    5754      <Private>False</Private>
    5855    </Reference>
    5956    <Reference Include="HeuristicLab.Data-3.3">
    60       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Data-3.3.dll</HintPath>
    61       <Private>False</Private>
    62     </Reference>
    63     <Reference Include="HeuristicLab.Hive-3.3">
    64       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Hive-3.3.dll</HintPath>
     57      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    6558      <Private>False</Private>
    6659    </Reference>
    6760    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6861      <SpecificVersion>False</SpecificVersion>
    69       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     62      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     63      <Private>False</Private>
    7064    </Reference>
    7165    <Reference Include="HeuristicLab.Optimization-3.3">
    72       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     66      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    7367      <Private>False</Private>
    7468    </Reference>
    7569    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    7670      <SpecificVersion>False</SpecificVersion>
    77       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     71      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    7872      <Private>False</Private>
    7973    </Reference>
    8074    <Reference Include="HeuristicLab.Persistence-3.3">
    81       <HintPath>..\..\..\..\stable\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     75      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    8276      <Private>False</Private>
    8377    </Reference>
    8478    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    85       <HintPath>..\..\..\..\stable\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     79      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    8680      <Private>False</Private>
    8781    </Reference>
     
    8983    <Reference Include="System.Core" />
    9084    <Reference Include="System.Drawing" />
    91     <Reference Include="System.ServiceModel" />
    92     <Reference Include="System.Xml.Linq" />
    93     <Reference Include="System.Data.DataSetExtensions" />
    94     <Reference Include="Microsoft.CSharp" />
    95     <Reference Include="System.Data" />
    96     <Reference Include="System.Xml" />
    9785  </ItemGroup>
    9886  <ItemGroup>
  • branches/thasling/DistributedGA/DistributedGA.Hive/P2PMigrationAnalyzer.cs

    r13982 r13997  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Data.SqlTypes;
    2524using System.IO;
    26 using System.ServiceModel.Configuration;
    27 using System.Threading;
    28 using DistributedGA.Core.Domain;
     25
    2926using DistributedGA.Core.Implementation;
    3027using DistributedGA.Core.Interface;
    3128using DistributedGA.Hive;
    32 using HeuristicLab.Clients.Hive;
    3329using HeuristicLab.Common;
    3430using HeuristicLab.Core;
     
    133129    }
    134130
    135     public override void InitializeState() {
    136       base.InitializeState();
    137       // init P2P
    138       if (h == null) {
    139         //otherwhise old object is not disposed correctly
    140         Init();
    141       }
    142     }
    143 
    144131    private void Init() {
    145132      h = new PeerNetworkMessageHandler();
Note: See TracChangeset for help on using the changeset viewer.