Free cookie consent management tool by TermsFeed Policy Generator

Changeset 357


Ignore:
Timestamp:
07/01/08 16:40:27 (16 years ago)
Author:
gkronber
Message:

worked on ticket #187. code is a mess. work-in-progress.

Location:
trunk/sources
Files:
18 added
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.CEDMA.Console/HeuristicLab.CEDMA.Console.csproj

    r352 r357  
    4242      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    4343    </Reference>
     44    <Reference Include="System.Drawing" />
     45    <Reference Include="System.Runtime.Serialization">
     46      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     47    </Reference>
     48    <Reference Include="System.ServiceModel">
     49      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     50    </Reference>
     51    <Reference Include="System.Windows.Forms" />
    4452    <Reference Include="System.Xml.Linq">
    4553      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    5260  </ItemGroup>
    5361  <ItemGroup>
     62    <Compile Include="Agent.cs" />
     63    <Compile Include="AgentList.cs" />
     64    <Compile Include="Console.cs" />
     65    <Compile Include="ConsoleEditor.cs">
     66      <SubType>UserControl</SubType>
     67    </Compile>
    5468    <Compile Include="HeuristicLabCedmaConsolePlugin.cs" />
     69    <Compile Include="IAgent.cs" />
     70    <Compile Include="IAgentList.cs" />
    5571    <Compile Include="Properties\AssemblyInfo.cs" />
     72    <Compile Include="AgentListView.cs">
     73      <SubType>UserControl</SubType>
     74    </Compile>
     75    <Compile Include="AgentListView.Designer.cs">
     76      <DependentUpon>AgentListView.cs</DependentUpon>
     77    </Compile>
     78    <Compile Include="AgentView.cs">
     79      <SubType>UserControl</SubType>
     80    </Compile>
     81    <Compile Include="AgentView.Designer.cs">
     82      <DependentUpon>AgentView.cs</DependentUpon>
     83    </Compile>
    5684  </ItemGroup>
    5785  <ItemGroup>
    5886    <None Include="HeuristicLab.snk" />
     87  </ItemGroup>
     88  <ItemGroup>
     89    <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
     90      <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
     91      <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
     92    </ProjectReference>
     93    <ProjectReference Include="..\HeuristicLab.Core\HeuristicLab.Core.csproj">
     94      <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
     95      <Name>HeuristicLab.Core</Name>
     96    </ProjectReference>
     97  </ItemGroup>
     98  <ItemGroup>
     99    <EmbeddedResource Include="AgentListView.resx">
     100      <DependentUpon>AgentListView.cs</DependentUpon>
     101      <SubType>Designer</SubType>
     102    </EmbeddedResource>
     103    <EmbeddedResource Include="AgentView.resx">
     104      <DependentUpon>AgentView.cs</DependentUpon>
     105      <SubType>Designer</SubType>
     106    </EmbeddedResource>
     107    <EmbeddedResource Include="ConsoleEditor.resx">
     108      <DependentUpon>ConsoleEditor.cs</DependentUpon>
     109      <SubType>Designer</SubType>
     110    </EmbeddedResource>
    59111  </ItemGroup>
    60112  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.CEDMA.Console/HeuristicLabCedmaConsolePlugin.cs

    r352 r357  
    2828  [ClassInfo(Name = "HeuristicLab.CEDMA.Console")]
    2929  [PluginFile(Filename = "HeuristicLab.CEDMA.Console.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.Core")]
    3031  [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces")]
    3132  [Dependency(Dependency = "HeuristicLab.CEDMA.Server")]

  • trunk/sources/HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj

    r352 r357  
    4242      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    4343    </Reference>
     44    <Reference Include="System.ServiceModel">
     45      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     46    </Reference>
    4447    <Reference Include="System.Xml.Linq">
    4548      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    5255  </ItemGroup>
    5356  <ItemGroup>
     57    <Compile Include="AgentStatus.cs" />
    5458    <Compile Include="HeuristicLabCedmaDbInterfacesPlugin.cs" />
     59    <Compile Include="IAgent.cs" />
     60    <Compile Include="IDatabase.cs" />
    5561    <Compile Include="Properties\AssemblyInfo.cs" />
    5662  </ItemGroup>

  • trunk/sources/HeuristicLab.CEDMA.DB/HeuristicLab.CEDMA.DB.csproj

    r352 r357  
    4242      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    4343    </Reference>
     44    <Reference Include="System.Data.Linq">
     45      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     46    </Reference>
     47    <Reference Include="System.Data.SQLite, Version=1.0.49.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
     48      <SpecificVersion>False</SpecificVersion>
     49      <HintPath>..\HeuristicLab.SQLite\System.Data.SQLite.DLL</HintPath>
     50    </Reference>
     51    <Reference Include="System.ServiceModel">
     52      <RequiredTargetFramework>3.0</RequiredTargetFramework>
     53    </Reference>
    4454    <Reference Include="System.Xml.Linq">
    4555      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    5262  </ItemGroup>
    5363  <ItemGroup>
     64    <Compile Include="Agent.cs" />
     65    <Compile Include="Database.cs" />
    5466    <Compile Include="HeuristicLabCedmaDbPlugin.cs" />
    5567    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    5769  <ItemGroup>
    5870    <None Include="HeuristicLab.snk" />
     71  </ItemGroup>
     72  <ItemGroup>
     73    <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
     74      <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
     75      <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
     76    </ProjectReference>
     77    <ProjectReference Include="..\HeuristicLab.SQLite\HeuristicLab.SQLite.csproj">
     78      <Project>{6960CBCD-E44B-49B0-BA86-671091C42C36}</Project>
     79      <Name>HeuristicLab.SQLite</Name>
     80    </ProjectReference>
    5981  </ItemGroup>
    6082  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.CEDMA.DB/HeuristicLabCedmaDbPlugin.cs

    r352 r357  
    2828  [ClassInfo(Name = "HeuristicLab.CEDMA.DB")]
    2929  [PluginFile(Filename = "HeuristicLab.CEDMA.DB.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.SQLite")]
    3031  [Dependency(Dependency = "HeuristicLab.CEDMA.DB.Interfaces")]
    3132  public class HeuristicLabCedmaDbPlugin : PluginBase {

  • trunk/sources/HeuristicLab.CEDMA.Server/HeuristicLab.CEDMA.Server.csproj

    r352 r357  
    3838      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    3939    </Reference>
     40    <Reference Include="System.Data.Linq">
     41      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     42    </Reference>
    4043    <Reference Include="System.Drawing" />
    4144    <Reference Include="System.Runtime.Serialization">
    … …  
    5659  </ItemGroup>
    5760  <ItemGroup>
    58     <Compile Include="AgentWorld.cs" />
    59     <Compile Include="IAgentWorld.cs" />
    6061    <Compile Include="ServerApplication.cs" />
    6162    <Compile Include="HeuristicLabCedmaServerPlugin.cs" />
    … …  
    6970  </ItemGroup>
    7071  <ItemGroup>
     72    <ProjectReference Include="..\HeuristicLab.CEDMA.DB.Interfaces\HeuristicLab.CEDMA.DB.Interfaces.csproj">
     73      <Project>{4F9BB789-D561-436B-B226-2BF44B7D0804}</Project>
     74      <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
     75    </ProjectReference>
     76    <ProjectReference Include="..\HeuristicLab.CEDMA.DB\HeuristicLab.CEDMA.DB.csproj">
     77      <Project>{B3D6D8D9-2B1F-47EC-9C73-77FAECF87310}</Project>
     78      <Name>HeuristicLab.CEDMA.DB</Name>
     79    </ProjectReference>
    7180    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    7281      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

  • trunk/sources/HeuristicLab.CEDMA.Server/ServerForm.cs

    r352 r357  
    3232using HeuristicLab.PluginInfrastructure;
    3333using System.Net;
     34using HeuristicLab.CEDMA.DB;
     35using HeuristicLab.CEDMA.DB.Interfaces;
    3436
    3537namespace HeuristicLab.CEDMA.Server {
    3638  public partial class ServerForm : Form {
    3739    private ServiceHost host;
    38     private AgentWorld agentWorld = new AgentWorld();
     40    private Database database = new Database();
    3941
    4042    public ServerForm() {
    … …  
    5153
    5254    private void Start() {
    53       host = new ServiceHost(agentWorld, new Uri(addressTextBox.Text));
     55      host = new ServiceHost(database, new Uri(addressTextBox.Text));
    5456      ServiceThrottlingBehavior throttlingBehavior = new ServiceThrottlingBehavior();
    5557      throttlingBehavior.MaxConcurrentSessions = 20;
    … …  
    6264        binding.Security.Mode = SecurityMode.None;
    6365
    64         host.AddServiceEndpoint(typeof(IAgentWorld), binding, addressTextBox.Text);
     66        host.AddServiceEndpoint(typeof(IDatabase), binding, addressTextBox.Text);
    6567        host.Open();
    6668      } catch (CommunicationException ex) {
    … …  
    7173
    7274    private void statusUpdateTimer_Tick(object sender, EventArgs e) {
    73       activeAgentsTextBox.Text = agentWorld.ActiveAgents.ToString();
    7475    }
    7576  }

  • trunk/sources/HeuristicLab.Logging/HeuristicLab.Logging.csproj

    r283 r357  
    4646  <ItemGroup>
    4747    <Compile Include="BestAverageWorstQualityCalculator.cs" />
     48    <Compile Include="StatisticsLogger.cs" />
    4849    <Compile Include="Logger.cs" />
    4950    <Compile Include="Linechart.cs" />

  • trunk/sources/HeuristicLab.StructureIdentification/HeuristicLab.StructureIdentification.csproj

    r287 r357  
    4848  </ItemGroup>
    4949  <ItemGroup>
     50    <Compile Include="EqualiserTuner.cs" />
    5051    <Compile Include="ProbabilisticTreeCreator.cs" />
    5152    <Compile Include="Evaluation\CoefficientOfDeterminationEvaluator.cs" />
    … …  
    7273    <Compile Include="Properties\AssemblyInfo.cs" />
    7374    <Compile Include="RampedTreeCreator.cs" />
     75    <Compile Include="OffspringEqualiser.cs" />
     76    <Compile Include="Recombination\StandardCrossOver.cs" />
    7477    <Compile Include="Recombination\SizeFairCrossOver.cs" />
    7578    <Compile Include="TreeGardener.cs" />
Note: See TracChangeset for help on using the changeset viewer.