Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/21/10 01:31:15 (15 years ago)
Author:
swagner
Message:

Started to adapt HeuristicLab.Data and HeuristicLab.Operators according to the changes in HeuristicLab.Core (#95)

Location:
trunk/sources/HeuristicLab.Operators/3.3
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Operators/3.3/EmptyOperator.cs

    r1530 r2663  
    2323using System.Collections.Generic;
    2424using System.Text;
     25using System.Xml;
     26using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2527using HeuristicLab.Core;
    2628
    2729namespace HeuristicLab.Operators {
    2830  /// <summary>
    29   /// Placeholder and also used for testing; Does nothing.
     31  /// An operator which represents an empty statement.
    3032  /// </summary>
    31   public class EmptyOperator : OperatorBase {
    32     /// <inheritdoc select="summary"/>
    33     public override string Description {
    34       get { return "An empty operator just does nothing. Useful for testing and as a place holder for sub-operators of SequentialSubScopesProcessor and ParallelSubScopesProcessor."; }
    35     }
    36 
    37     /// <summary>
    38     /// Initializes a new instance of <see cref="EmptyOperator"/>.
    39     /// </summary>
     33  [Item("Empty Operator", "An operator which represents an empty statement.")]
     34  [Creatable("Test")]
     35  [EmptyStorableClass]
     36  public sealed class EmptyOperator : StandardOperatorBase {
    4037    public EmptyOperator()
    4138      : base() {
    4239    }
    43 
    44     /// <summary>
    45     /// Does nothing.
    46     /// </summary>
    47     /// <param name="scope">The scope to apply the operator on.</param>
    48     /// <returns><c>null</c>.</returns>
    49     public override IOperation Apply(IScope scope) {
    50       return null;
    51     }
    5240  }
    5341}

  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

    r2524 r2663  
    8585  </ItemGroup>
    8686  <ItemGroup>
    87     <Compile Include="AddVariableInfoDialog.cs">
    88       <SubType>Form</SubType>
    89     </Compile>
    90     <Compile Include="AddVariableInfoDialog.Designer.cs">
    91       <DependentUpon>AddVariableInfoDialog.cs</DependentUpon>
    92     </Compile>
    93     <Compile Include="CombinedOperator.cs" />
    94     <Compile Include="CombinedOperatorView.cs">
    95       <SubType>UserControl</SubType>
    96     </Compile>
    97     <Compile Include="CombinedOperatorView.Designer.cs">
    98       <DependentUpon>CombinedOperatorView.cs</DependentUpon>
    99     </Compile>
    100     <Compile Include="ComparatorBase.cs" />
    101     <Compile Include="ConditionalBranch.cs">
     87    <Compile Include="EmptyOperator.cs">
    10288      <SubType>Code</SubType>
    10389    </Compile>
    104     <Compile Include="DelegatingOperator.cs" />
    105     <Compile Include="DoubleCounter.cs" />
    106     <Compile Include="ScopeCleaner.cs" />
    107     <Compile Include="StochasticMultiBranch.cs" />
    108     <Compile Include="SubScopesMixer.cs" />
    109     <Compile Include="DataCollector.cs" />
    110     <Compile Include="EqualToComparator.cs" />
    111     <Compile Include="GreaterOrEqualThanComparator.cs" />
    112     <Compile Include="GreaterThanComparator.cs" />
    113     <Compile Include="LessOrEqualThanComparator.cs" />
    114     <Compile Include="LessThanComparator.cs" />
    115     <Compile Include="OperatorExtractor.cs" />
    116     <Compile Include="ParallelProcessor.cs" />
    117     <Compile Include="EmptyOperator.cs" />
    118     <Compile Include="SequentialProcessor.cs" />
    119     <Compile Include="SingleObjectiveEvaluatorBase.cs" />
    120     <Compile Include="Sorter.cs" />
    121     <Compile Include="StochasticBranch.cs" />
    122     <Compile Include="SubScopesRemover.cs" />
    123     <Compile Include="UnequalToComparator.cs" />
    124     <Compile Include="UniformSequentialSubScopesProcessor.cs" />
    125     <Compile Include="UniformParallelSubScopesProcessor.cs" />
    126     <Compile Include="ParallelSubScopesProcessor.cs" />
    127     <Compile Include="SequentialSubScopesProcessor.cs" />
    128     <Compile Include="SubScopesCreater.cs" />
    129     <Compile Include="Counter.cs" />
    13090    <Compile Include="HeuristicLabOperatorsPlugin.cs" />
     91    <Compile Include="OperatorBase.cs" />
    13192    <Compile Include="Properties\AssemblyInfo.cs" />
    132     <Compile Include="VariableInjector.cs" />
    133     <Compile Include="VariableInjectorView.cs">
    134       <SubType>UserControl</SubType>
    135     </Compile>
    136     <Compile Include="VariableInjectorView.Designer.cs">
    137       <DependentUpon>VariableInjectorView.cs</DependentUpon>
    138     </Compile>
     93    <Compile Include="StandardOperatorBase.cs" />
    13994  </ItemGroup>
    14095  <ItemGroup>
    141     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    142       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    143       <Name>HeuristicLab.Core.Views-3.3</Name>
     96    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     97      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     98      <Name>HeuristicLab.Collections-3.3</Name>
     99    </ProjectReference>
     100    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj">
     101      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     102      <Name>HeuristicLab.Common.Resources-3.2</Name>
    144103    </ProjectReference>
    145104    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    … …  
    150109      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    151110      <Name>HeuristicLab.Data-3.3</Name>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
    154       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    155       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
    156     </ProjectReference>
    157     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    158       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    159       <Name>HeuristicLab.MainForm-3.2</Name>
    160111    </ProjectReference>
    161112    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    … …  
    171122    <None Include="HeuristicLab.snk" />
    172123    <None Include="Properties\AssemblyInfo.frame" />
    173   </ItemGroup>
    174   <ItemGroup>
    175     <EmbeddedResource Include="AddVariableInfoDialog.resx">
    176       <DependentUpon>AddVariableInfoDialog.cs</DependentUpon>
    177       <SubType>Designer</SubType>
    178     </EmbeddedResource>
    179     <EmbeddedResource Include="CombinedOperatorView.resx">
    180       <DependentUpon>CombinedOperatorView.cs</DependentUpon>
    181       <SubType>Designer</SubType>
    182     </EmbeddedResource>
    183124  </ItemGroup>
    184125  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Operators/3.3/HeuristicLabOperatorsPlugin.cs

    r2524 r2663  
    2929  /// Plugin class for HeuristicLab.Operators plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.Operators-3.3")]
    32   [PluginFile(Filename = "HeuristicLab.Operators-3.3.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    34   [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
    35   [Dependency(Dependency = "HeuristicLab.Data-3.3")]
    36   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
    37   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
    38   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")] 
     31  [Plugin("HeuristicLab.Operators-3.3")]
     32  [PluginFile("HeuristicLab.Operators-3.3.dll", PluginFileType.Assembly)]
     33  [PluginDependency("HeuristicLab.Collections-3.3")]
     34  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
     35  [PluginDependency("HeuristicLab.Core-3.3")]
     36  [PluginDependency("HeuristicLab.Data-3.3")]
     37  [PluginDependency("HeuristicLab.Persistence-3.3")] 
    3938  public class HeuristicLabOperatorsPlugin : PluginBase {
    4039  }

  • trunk/sources/HeuristicLab.Operators/3.3/OperatorBase.cs

    r2662 r2663  
    2626using System.Drawing;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Common;
     28using HeuristicLab.Core;
    2929using HeuristicLab.Collections;
    3030
    31 namespace HeuristicLab.Core {
     31namespace HeuristicLab.Operators {
    3232  /// <summary>
    3333  /// The base class for all operators.

  • trunk/sources/HeuristicLab.Operators/3.3/Properties/AssemblyInfo.frame

    r1673 r2663  
    2929// associated with an assembly.
    3030[assembly: AssemblyTitle("HeuristicLab.Operators")]
    31 [assembly: AssemblyDescription("Various HeuristicLab operator classes")]
     31[assembly: AssemblyDescription("HeuristicLab operator classes")]
    3232[assembly: AssemblyConfiguration("")]
    3333[assembly: AssemblyCompany("")]

  • trunk/sources/HeuristicLab.Operators/3.3/StandardOperatorBase.cs

    r2662 r2663  
    2525using System.Xml;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Common;
     27using HeuristicLab.Core;
    2828
    29 namespace HeuristicLab.Core {
     29namespace HeuristicLab.Operators {
    3030  /// <summary>
    3131  /// A base class for operators which have only one successor.
Note: See TracChangeset for help on using the changeset viewer.