Changeset 11465


Ignore:
Timestamp:
10/15/14 02:28:04 (5 years ago)
Author:
swagner
Message:

#2205: Worked on optimization networks

Location:
branches/OptimizationNetworks
Files:
7 added
8 edited

Legend:

Unmodified
Added
Removed
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks.Views/3.3/HeuristicLab.Optimization.Networks.Views-3.3.csproj

    r11463 r11465  
    8585  </ItemGroup>
    8686  <ItemGroup>
     87    <Compile Include="ClientNodeView.cs">
     88      <SubType>UserControl</SubType>
     89    </Compile>
     90    <Compile Include="ClientNodeView.Designer.cs">
     91      <DependentUpon>ClientNodeView.cs</DependentUpon>
     92    </Compile>
    8793    <Compile Include="AlgorithmServiceNodeView.cs">
    8894      <SubType>UserControl</SubType>
     
    126132    <Compile Include="ClientPortView.Designer.cs">
    127133      <DependentUpon>ClientPortView.cs</DependentUpon>
     134    </Compile>
     135    <Compile Include="ServiceParameterCollectionCollectionView.cs">
     136      <SubType>UserControl</SubType>
     137    </Compile>
     138    <Compile Include="ServiceParameterCollectionCollectionView.Designer.cs">
     139      <DependentUpon>ServiceParameterCollectionCollectionView.cs</DependentUpon>
    128140    </Compile>
    129141    <Compile Include="ServiceParameterCollectionView.cs">
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/AlgorithmNode.cs

    r11423 r11465  
    5252      : base(original, cloner) {
    5353      algorithm = cloner.Clone(original.algorithm);
    54       RegisterPortsEvents();
    5554      RegisterAlgorithmEvents();
    5655    }
    57     public AlgorithmNode()
    58       : base("AlgorithmNode") {
    59       RegisterPortsEvents();
    60     }
    61     public AlgorithmNode(string name)
    62       : base(name) {
    63       RegisterPortsEvents();
    64     }
    65     public AlgorithmNode(string name, string description)
    66       : base(name, description) {
    67       RegisterPortsEvents();
    68     }
     56    public AlgorithmNode() : base("AlgorithmNode") { }
     57    public AlgorithmNode(string name) : base(name) { }
     58    public AlgorithmNode(string name, string description) : base(name, description) { }
    6959
    7060    [StorableHook(HookType.AfterDeserialization)]
    7161    private void AfterDeserialization() {
    72       RegisterPortsEvents();
    7362      RegisterAlgorithmEvents();
    7463    }
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/AlgorithmServiceNode.cs

    r11463 r11465  
    6363      template = cloner.Clone(original.template);
    6464      runs = cloner.Clone(original.runs);
    65       RegisterPortsEvents();
    6665    }
    6766    public AlgorithmServiceNode()
    6867      : base("AlgorithmServiceNode") {
    6968      runs = new RunCollection();
    70       RegisterPortsEvents();
    7169    }
    7270    public AlgorithmServiceNode(string name)
    7371      : base(name) {
    7472      runs = new RunCollection();
    75       RegisterPortsEvents();
    7673    }
    7774    public AlgorithmServiceNode(string name, string description)
    7875      : base(name, description) {
    7976      runs = new RunCollection();
    80       RegisterPortsEvents();
    81     }
    82 
    83     [StorableHook(HookType.AfterDeserialization)]
    84     private void AfterDeserialization() {
    85       RegisterPortsEvents();
    8677    }
    8778
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/HeuristicLab.Optimization.Networks-3.3.csproj

    r11463 r11465  
    8484  </ItemGroup>
    8585  <ItemGroup>
     86    <Compile Include="ClientNode.cs" />
    8687    <Compile Include="AlgorithmServiceNode.cs" />
     88    <Compile Include="IClientNode.cs" />
    8789    <Compile Include="IAlgorithmServiceNode.cs" />
    8890    <Compile Include="IEntity.cs" />
    8991    <Compile Include="IClientPort.cs" />
    9092    <Compile Include="IClientServicePort.cs" />
     93    <Compile Include="ServiceParameterCollectionCollection.cs" />
    9194    <Compile Include="ServiceParameterType.cs" />
    9295    <Compile Include="IServiceParameter.cs" />
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/IValuePort.cs

    r11454 r11465  
    2525namespace HeuristicLab.Optimization.Networks {
    2626  public interface IValuePort : IPort {
     27    Type DataType { get; }
    2728    IItem Value { get; }
    2829
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/MultiplierNode.cs

    r11452 r11465  
    4242    [StorableConstructor]
    4343    protected MultiplierNode(bool deserializing) : base(deserializing) { }
    44     protected MultiplierNode(MultiplierNode original, Cloner cloner)
    45       : base(original, cloner) {
    46       RegisterPortEvents();
    47     }
     44    protected MultiplierNode(MultiplierNode original, Cloner cloner) : base(original, cloner) { }
    4845    public MultiplierNode()
    4946      : base("MultiplierNode") {
     
    5754      : base(name, description) {
    5855      Initialize();
    59     }
    60 
    61     [StorableHook(HookType.AfterDeserialization)]
    62     private void AfterDeserialization() {
    63       RegisterPortEvents();
    6456    }
    6557
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/ValuePort.cs

    r11454 r11465  
    2929  [StorableClass]
    3030  public abstract class ValuePort<T> : Port, IValuePort<T> where T : class, IItem {
     31    public Type DataType {
     32      get { return typeof(T); }
     33    }
     34
    3135    [Storable]
    3236    protected T value;
  • branches/OptimizationNetworks/HeuristicLab.Optimization.Networks/3.3/VariablesNode.cs

    r11452 r11465  
    4444      : base(original, cloner) {
    4545      variables = cloner.Clone(original.variables);
    46       RegisterPortsEvents();
    4746      RegisterVariablesEvents();
    4847    }
     
    5049      : base("VariablesNode") {
    5150      variables = new VariableCollection();
    52       RegisterPortsEvents();
    5351      RegisterVariablesEvents();
    5452    }
     
    5654      : base(name) {
    5755      variables = new VariableCollection();
    58       RegisterPortsEvents();
    5956      RegisterVariablesEvents();
    6057    }
     
    6259      : base(name, description) {
    6360      variables = new VariableCollection();
    64       RegisterPortsEvents();
    6561      RegisterVariablesEvents();
    6662    }
     
    6864    [StorableHook(HookType.AfterDeserialization)]
    6965    private void AfterDeserialization() {
    70       RegisterPortsEvents();
    7166      RegisterVariablesEvents();
    7267    }
Note: See TracChangeset for help on using the changeset viewer.