Changeset 1576


Ignore:
Timestamp:
04/16/09 17:31:06 (12 years ago)
Author:
dtraxing
Message:

Changed version to 3.2 and updated SGAMain.(ticket #580)

Location:
trunk/sources
Files:
1 deleted
4 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.SGA.Hardwired/3.2/HeuristicLab.SGA.Hardwired-3.2.csproj

    r1561 r1576  
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    1111    <RootNamespace>HeuristicLab.SGA.Hardwired</RootNamespace>
    12     <AssemblyName>HeuristicLab.SGA.Hardwired-3.3</AssemblyName>
     12    <AssemblyName>HeuristicLab.SGA.Hardwired-3.2</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
  • trunk/sources/HeuristicLab.SGA.Hardwired/3.2/HeuristicLabSGAHardwiredPlugin.cs

    r1543 r1576  
    2929  /// Plugin class for HeuristicLab.SGA.Hardwired plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.SGA.Hardwired-3.3")]
    32   [PluginFile(Filename = "HeuristicLab.SGA.Hardwired-3.3.dll", Filetype = PluginFileType.Assembly)]
     31  [ClassInfo(Name = "HeuristicLab.SGA.Hardwired-3.2")]
     32  [PluginFile(Filename = "HeuristicLab.SGA.Hardwired-3.2.dll", Filetype = PluginFileType.Assembly)]
    3333  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
    3434  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
  • trunk/sources/HeuristicLab.SGA.Hardwired/3.2/Properties/AssemblyInfo.frame

    r1543 r1576  
    5454// You can specify all the values or you can default the Revision and Build Numbers
    5555// by using the '*' as shown below:
    56 [assembly: AssemblyVersion("3.3.0.$WCREV$")]
    57 [assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     56[assembly: AssemblyVersion("3.2.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.2.0.$WCREV$")]
    5858[assembly: AssemblyBuildDate("$WCNOW$")]
  • trunk/sources/HeuristicLab.SGA.Hardwired/3.2/SGAMainWithHWControllStructures.cs

    r1560 r1576  
    4141      : base() {
    4242      AddVariableInfo(new VariableInfo("Selector", "Selection strategy for SGA", typeof(OperatorBase), VariableKind.In));
     43      AddVariableInfo(new VariableInfo("MaximumGenerations", "Maximum number of generations to create", typeof(IntData), VariableKind.In));
     44
     45      Name = "SGAMainWithHWControllStructures";
    4346    }
    4447
    4548    public override IOperation Apply(IScope scope) {
    46       int nrOfGenerations = 1000;
     49
     50      //base.Apply(scope); // noch nachfragen ob das auch in ordnung wäre
     51      for (int i = 0; i < SubOperators.Count; i++) {
     52        if (scope.GetVariable(SubOperators[i].Name) != null)
     53          scope.RemoveVariable(SubOperators[i].Name);
     54        scope.AddVariable(new Variable(SubOperators[i].Name, SubOperators[i]));
     55      }
    4756
    4857      OperatorBase selector = (OperatorBase)GetVariableValue("Selector", scope, true);
     
    5059      OperatorBase createReplacement = new CreateReplacement();
    5160      QualityLogger ql = new QualityLogger();
    52      
     61
    5362      BestAverageWorstQualityCalculator bawqc = new BestAverageWorstQualityCalculator();
    5463      DataCollector dc = new DataCollector();
     
    5766      names.Add(new StringData("AverageQuality"));
    5867      names.Add(new StringData("WorstQuality"));
    59      
     68
    6069      LinechartInjector lci = new LinechartInjector();
    6170      lci.GetVariableInfo("Linechart").ActualName = "Quality Linechart";
     
    7079      ltc.GetVariableInfo("Result").ActualName = "GenerationsCondition";
    7180
    72       for (int i = 0; i < nrOfGenerations; i++) {
     81      IntData maxGenerations = GetVariableValue<IntData>("MaximumGenerations", scope, true);
     82      //IntData nrOfGenerations = GetVariableValue<IntData>("Generations", scope, true);
     83
     84      for (int i = 0; i < maxGenerations.Data; i++) {
    7385        selector.Execute(scope);
    7486        createChildren.Execute(scope.SubScopes[1]);
    7587        createReplacement.Execute(scope);
    7688        ql.Execute(scope);
    77         bawqc.Equals(scope);
     89        bawqc.Execute(scope);
    7890        dc.Execute(scope);
    7991        lci.Execute(scope);
    80         c.Execute(scope);
    81         ltc.Execute(scope);
     92        //c.Execute(scope);
     93        //ltc.Execute(scope);
     94        //nrOfGenerations.Data = i;
    8295      }
     96
     97     
    8398      return null;
    8499    } // Apply
  • trunk/sources/HeuristicLab.sln

    r1568 r1576  
    159159Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tracing-3.2", "HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj", "{EE2034D9-6E27-48A1-B855-42D45F69A4FC}"
    160160EndProject
    161 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA.Hardwired-3.3", "HeuristicLab.SGA.Hardwired\3.3\HeuristicLab.SGA.Hardwired-3.3.csproj", "{583705E2-B1F7-42B8-8149-96E7AECA171A}"
     161Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA.Hardwired-3.2", "HeuristicLab.SGA.Hardwired\3.2\HeuristicLab.SGA.Hardwired-3.2.csproj", "{583705E2-B1F7-42B8-8149-96E7AECA171A}"
    162162EndProject
    163163Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.Test", "HeuristicLab.Persistence\Test\HeuristicLab.Persistence.Test.csproj", "{E2245078-6F40-449E-A370-01A97A7C5E6A}"
Note: See TracChangeset for help on using the changeset viewer.