Changeset 13077


Ignore:
Timestamp:
10/29/15 10:08:31 (4 years ago)
Author:
jkarder
Message:

#2205: worked on optimization networks

  • added first version of network visualization
  • updated frame files
Location:
branches/OptimizationNetworks
Files:
35 added
14 edited

Legend:

Unmodified
Added
Removed
  • branches/OptimizationNetworks/HeuristicLab.Common.Resources/3.3/Properties/AssemblyInfo.cs.frame

    r11576 r13077  
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
    122using System.Reflection;
    223using System.Runtime.CompilerServices;
     
    1132[assembly: AssemblyCompany("")]
    1233[assembly: AssemblyProduct("HeuristicLab")]
    13 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    1435[assembly: AssemblyTrademark("")]
    1536[assembly: AssemblyCulture("")]
     
    3051//      Revision
    3152//
     53// You can specify all the values or you can default the Build and Revision Numbers
     54// by using the '*' as shown below:
     55// [assembly: AssemblyVersion("1.0.*")]
    3256[assembly: AssemblyVersion("3.3.0.0")]
    33 [assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
  • branches/OptimizationNetworks/HeuristicLab.Modeler/3.3/Properties/AssemblyInfo.cs.frame

    r11401 r13077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
     
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Properties/AssemblyInfo.cs.frame

    r11401 r13077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2727// set of attributes. Change these attribute values to modify the information
    2828// associated with an assembly.
    29 [assembly: AssemblyTitle("HeuristicLab.Optimization.Networks.Views")]
     29[assembly: AssemblyTitle("HeuristicLab.Networks.Views")]
    3030[assembly: AssemblyDescription("Views of the HeuristicLab optimization networks classes")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
     
    5151//      Revision
    5252//
    53 // You can specify all the values or you can default the Revision and Build Numbers
     53// You can specify all the values or you can default the Build and Revision Numbers
    5454// by using the '*' as shown below:
     55// [assembly: AssemblyVersion("1.0.*")]
    5556[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/INetworkItem.cs

    r11577 r13077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/IPort.cs

    r11577 r13077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/NetworkItem.cs

    r11577 r13077  
    2020#endregion
    2121
    22 using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    24 using System;
    2522using System.Collections.Generic;
    2623using System.Drawing;
    2724using System.Linq;
     25using HeuristicLab.Common;
     26using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2827
    2928namespace HeuristicLab.Core.Networks {
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/Node.cs

    r11577 r13077  
    2020#endregion
    2121
    22 using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2422using System.Collections.Generic;
    2523using System.Drawing;
    2624using System.Linq;
     25using HeuristicLab.Common;
     26using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Core.Networks {
    2929  [Item("Node", "Abstract base class for nodes of a network.")]
    3030  [StorableClass]
    31   public abstract class Node : NetworkItem, INode {
     31  public abstract class Node : NetworkItem, IVisualizableNode {
    3232    public static new Image StaticItemImage {
    3333      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
     
    5555        if (readOnlyPorts == null) readOnlyPorts = ports.AsReadOnly();
    5656        return readOnlyPorts;
     57      }
     58    }
     59
     60    public string VisualName { get { return Name; } }
     61
     62    [Storable]
     63    private INodeVisualProperties visualProperties;
     64    public INodeVisualProperties VisualProperties {
     65      get {
     66        if (visualProperties == null)
     67          visualProperties = new NodeVisualProperties();
     68        return visualProperties;
    5769      }
    5870    }
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Core/Port.cs

    r11713 r13077  
    2020#endregion
    2121
     22using System.Drawing;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    24 using System.Drawing;
    2525
    2626namespace HeuristicLab.Core.Networks {
    2727  [Item("Port", "Abstract base class for ports of network nodes.")]
    2828  [StorableClass]
    29   public abstract class Port : NetworkItem, IPort {
     29  public abstract class Port : NetworkItem, IVisualizablePort {
    3030    public static new Image StaticItemImage {
    3131      get { return HeuristicLab.Common.Resources.VSImageLibrary.Interface; }
     
    4040    }
    4141
     42    [Storable]
     43    private IPortVisualProperties visualProperties;
     44    public IPortVisualProperties VisualProperties {
     45      get {
     46        if (visualProperties == null)
     47          visualProperties = new PortVisualProperties();
     48        return visualProperties;
     49      }
     50    }
     51
    4252    [StorableConstructor]
    4353    protected Port(bool deserializing) : base(deserializing) { }
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/HeuristicLab.Networks-3.3.csproj

    r12944 r13077  
    8080  </PropertyGroup>
    8181  <ItemGroup>
    82     <Reference Include="HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3">
    83       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.dll</HintPath>
    84       <Private>False</Private>
    85     </Reference>
    8682    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8783      <SpecificVersion>False</SpecificVersion>
     
    120116    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    121117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    122       <Private>False</Private>
    123     </Reference>
    124     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    125       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    126118      <Private>False</Private>
    127119    </Reference>
     
    211203    </Compile>
    212204    <Compile Include="ConfigurationPort.cs" />
     205    <Compile Include="Core\INodeVisualProperties.cs" />
     206    <Compile Include="Core\IPortVisualProperties.cs" />
     207    <Compile Include="Core\IVisualizableNode.cs" />
     208    <Compile Include="Core\IVisualizablePort.cs" />
     209    <Compile Include="Core\IVisualProperties.cs" />
     210    <Compile Include="Core\NodeVisualProperties.cs" />
     211    <Compile Include="Core\PortVisualProperties.cs" />
     212    <Compile Include="Core\VisualProperties.cs" />
    213213    <Compile Include="ExecutionPort.cs" />
    214214    <Compile Include="FeatureSelection Network\FeatureSelectionConnector.cs" />
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Plugin.cs.frame

    r12232 r13077  
    2828  [Plugin("HeuristicLab.Networks", "3.3.11.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Networks-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Algorithms.DataAnalysis", "3.4")]
     31  [PluginDependency("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3")]
     32  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3033  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3134  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3740  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3841  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     42  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3943  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     44  [PluginDependency("HeuristicLab.Problems.Binary", "3.3")]
     45  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
     46  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
     47  [PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
     48  [PluginDependency("HeuristicLab.Problems.Knapsack", "3.3")]
     49  [PluginDependency("HeuristicLab.Problems.TravelingSalesman", "3.3")]
     50  [PluginDependency("HeuristicLab.Random", "3.3")]
    4051  [PluginDependency("HeuristicLab.Scripting", "3.3")]
     52  [PluginDependency("HeuristicLab.Selection", "3.3")]
    4153  public class HeuristicLabNetworksPlugin : PluginBase {
    4254  }
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNetworkItem.cs

    r12944 r13077  
    2020#endregion
    2121
    22 using HeuristicLab.Common;
    23 using HeuristicLab.Core;
    24 using HeuristicLab.Core.Networks;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Scripting;
    27 using Microsoft.CSharp;
    2822using System;
    2923using System.CodeDom.Compiler;
     
    3428using System.Reflection;
    3529using System.Text;
     30using HeuristicLab.Common;
     31using HeuristicLab.Core;
     32using HeuristicLab.Core.Networks;
     33using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HeuristicLab.Scripting;
     35using Microsoft.CSharp;
    3636
    3737namespace HeuristicLab.Networks.Programmable {
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Programmable/ProgrammableNode.cs

    r12944 r13077  
    2020#endregion
    2121
     22using System.Collections.Generic;
     23using System.Drawing;
     24using System.Linq;
     25using System.Threading;
    2226using HeuristicLab.Common;
    2327using HeuristicLab.Core;
    2428using HeuristicLab.Core.Networks;
    2529using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using System.Collections.Generic;
    27 using System.Drawing;
    28 using System.Linq;
    29 using System.Threading;
    3030
    3131namespace HeuristicLab.Networks.Programmable {
    3232  [Item("ProgrammableNode", "Abstract base class for programmable nodes of a network.")]
    3333  [StorableClass]
    34   public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode {
     34  public abstract class ProgrammableNode : ProgrammableNetworkItem, IProgrammableNode, IVisualizableNode {
    3535    public static new Image StaticItemImage {
    3636      get { return HeuristicLab.Common.Resources.VSImageLibrary.RadialChart; }
     
    5858      }
    5959    }
     60
     61    public string VisualName { get { return Name; } }
     62
     63    [Storable]
     64    private INodeVisualProperties visualProperties;
     65    public INodeVisualProperties VisualProperties {
     66      get {
     67        if (visualProperties == null)
     68          visualProperties = new NodeVisualProperties();
     69        return visualProperties;
     70      }
     71    }
    6072    #endregion
    6173
     
    115127      IKeyedItemCollection<string, IPort> INode.Ports {
    116128        get { return Ports; }
     129      }
     130
     131      public string VisualName { get { return Context.VisualName; } }
     132
     133      public INodeVisualProperties VisualProperties {
     134        get { return Context.VisualProperties; }
    117135      }
    118136      #endregion
  • branches/OptimizationNetworks/HeuristicLab.Networks/3.3/Properties/AssemblyInfo.cs.frame

    r11401 r13077  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2727// set of attributes. Change these attribute values to modify the information
    2828// associated with an assembly.
    29 [assembly: AssemblyTitle("HeuristicLab.Optimization.Networks")]
     29[assembly: AssemblyTitle("HeuristicLab.Networks")]
    3030[assembly: AssemblyDescription("HeuristicLab optimization networks classes")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
     
    5151//      Revision
    5252//
    53 // You can specify all the values or you can default the Revision and Build Numbers
     53// You can specify all the values or you can default the Build and Revision Numbers
    5454// by using the '*' as shown below:
     55// [assembly: AssemblyVersion("1.0.*")]
    5556[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]
  • branches/OptimizationNetworks/OptimizationNetworks.sln

    r12232 r13077  
    11
    22Microsoft Visual Studio Solution File, Format Version 12.00
    3 # Visual Studio 2013
    4 VisualStudioVersion = 12.0.31101.0
     3# Visual Studio 14
     4VisualStudioVersion = 14.0.23107.0
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Modeler-3.3", "HeuristicLab.Modeler\3.3\HeuristicLab.Modeler-3.3.csproj", "{37B08E61-93B1-4184-AE21-F2B5DE8A40F8}"
     
    1111EndProject
    1212Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Common.Resources-3.3", "HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj", "{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}"
     13EndProject
     14Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Networks.Views.NetworkVisualization-3.3", "HeuristicLab.Networks.Views.NetworkVisualization\3.3\HeuristicLab.Networks.Views.NetworkVisualization-3.3.csproj", "{B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}"
     15EndProject
     16Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Networks.Views.NetworkVisualization.Views-3.3", "HeuristicLab.Networks.Views.NetworkVisualization.Views\3.3\HeuristicLab.Networks.Views.NetworkVisualization.Views-3.3.csproj", "{A1EFA7B2-C288-4342-8318-27F4D2F29C18}"
    1317EndProject
    1418Global
     
    7074    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.ActiveCfg = Release|x86
    7175    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.Build.0 = Release|x86
     76    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     77    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|Any CPU.Build.0 = Debug|Any CPU
     78    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|x64.ActiveCfg = Debug|x64
     79    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|x64.Build.0 = Debug|x64
     80    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|x86.ActiveCfg = Debug|x86
     81    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Debug|x86.Build.0 = Debug|x86
     82    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|Any CPU.ActiveCfg = Release|Any CPU
     83    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|Any CPU.Build.0 = Release|Any CPU
     84    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|x64.ActiveCfg = Release|x64
     85    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|x64.Build.0 = Release|x64
     86    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|x86.ActiveCfg = Release|x86
     87    {B76A8CF7-BE2A-4CE7-943D-AB19A7CC7798}.Release|x86.Build.0 = Release|x86
     88    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     89    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
     90    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|x64.ActiveCfg = Debug|x64
     91    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|x64.Build.0 = Debug|x64
     92    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|x86.ActiveCfg = Debug|x86
     93    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Debug|x86.Build.0 = Debug|x86
     94    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
     95    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|Any CPU.Build.0 = Release|Any CPU
     96    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|x64.ActiveCfg = Release|x64
     97    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|x64.Build.0 = Release|x64
     98    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|x86.ActiveCfg = Release|x86
     99    {A1EFA7B2-C288-4342-8318-27F4D2F29C18}.Release|x86.Build.0 = Release|x86
    72100  EndGlobalSection
    73101  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.