Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/14/08 22:55:57 (16 years ago)
Author:
gkronber
Message:

merged changesets r644:647 and r651:655 from the GpPluginsRefactoringBranch back into the trunk (#177)

Location:
trunk/sources/HeuristicLab.GP.SantaFe
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.GP.SantaFe/AntInterpreter.cs

    r641 r656  
    2828using System.Xml;
    2929using System.Diagnostics;
    30 using HeuristicLab.Functions;
    3130
    3231namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Evaluator.cs

    r641 r656  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Functions;
    2928using HeuristicLab.DataAnalysis;
    3029

  • trunk/sources/HeuristicLab.GP.SantaFe/FunctionLibraryInjector.cs

    r641 r656  
    2828using HeuristicLab.DataAnalysis;
    2929using HeuristicLab.Constraints;
    30 using HeuristicLab.StructureIdentification;
    31 using HeuristicLab.Functions;
    3230
    3331namespace HeuristicLab.GP.SantaFe {
    … …  
    8280    }
    8381
    84     private void SetAllowedSubOperators(HeuristicLab.Functions.IFunction f, HeuristicLab.Functions.IFunction[] gs) {
     82    private void SetAllowedSubOperators(IFunction f, IFunction[] gs) {
    8583      foreach(IConstraint c in f.Constraints) {
    8684        if(c is SubOperatorTypeConstraint) {
    8785          SubOperatorTypeConstraint typeConstraint = c as SubOperatorTypeConstraint;
    8886          typeConstraint.Clear();
    89           foreach(HeuristicLab.Functions.IFunction g in gs) {
     87          foreach(IFunction g in gs) {
    9088            typeConstraint.AddOperator(g);
    9189          }
    … …  
    9391          AllSubOperatorsTypeConstraint typeConstraint = c as AllSubOperatorsTypeConstraint;
    9492          typeConstraint.Clear();
    95           foreach(HeuristicLab.Functions.IFunction g in gs) {
     93          foreach(IFunction g in gs) {
    9694            typeConstraint.AddOperator(g);
    9795          }

  • trunk/sources/HeuristicLab.GP.SantaFe/HeuristicLab.GP.SantaFe.csproj

    r641 r656  
    9595      <Name>HeuristicLab.Data</Name>
    9696    </ProjectReference>
    97     <ProjectReference Include="..\HeuristicLab.Functions\HeuristicLab.Functions.csproj">
    98       <Project>{B95CA6E2-34BC-4430-994D-BD6E99375319}</Project>
    99       <Name>HeuristicLab.Functions</Name>
     97    <ProjectReference Include="..\HeuristicLab.GP\HeuristicLab.GP.csproj">
     98      <Project>{1F1CF3ED-374C-4288-995B-93F6B872F571}</Project>
     99      <Name>HeuristicLab.GP</Name>
    100100    </ProjectReference>
    101101    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    … …  
    106106      <Project>{47019A74-F7F7-482E-83AA-D3F4F777E879}</Project>
    107107      <Name>HeuristicLab.Random</Name>
    108     </ProjectReference>
    109     <ProjectReference Include="..\HeuristicLab.StructureIdentification\HeuristicLab.StructureIdentification.csproj">
    110       <Project>{5948F299-0A5E-43B9-8F17-2D15298EEC34}</Project>
    111       <Name>HeuristicLab.StructureIdentification</Name>
    112108    </ProjectReference>
    113109  </ItemGroup>

  • trunk/sources/HeuristicLab.GP.SantaFe/HeuristicLabGPSantaFePlugin.cs

    r641 r656  
    2828  [ClassInfo(Name = "HeuristicLab.GP.SantaFe-3.2")]
    2929  [PluginFile(Filename = "HeuristicLab.GP.SantaFe-3.2.dll", Filetype = PluginFileType.Assembly)]
     30  [Dependency(Dependency = "HeuristicLab.GP-3.2")]
    3031  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    3132  [Dependency(Dependency = "HeuristicLab.Data-3.2")]

  • trunk/sources/HeuristicLab.GP.SantaFe/IfFoodAhead.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Left.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Move.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Prog2.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Prog3.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/Right.cs

    r641 r656  
    2929using HeuristicLab.DataAnalysis;
    3030using HeuristicLab.Random;
    31 using HeuristicLab.Functions;
    3231
    3332namespace HeuristicLab.GP.SantaFe {

  • trunk/sources/HeuristicLab.GP.SantaFe/SymbolTable.cs

    r641 r656  
    2626using HeuristicLab.Core;
    2727using System.Xml;
    28 using HeuristicLab.Functions;
    2928
    3029namespace HeuristicLab.GP.SantaFe {
Note: See TracChangeset for help on using the changeset viewer.