Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9184


Ignore:
Timestamp:
01/23/13 14:08:38 (11 years ago)
Author:
ascheibe
Message:

#2005 merged changes from trunk into branch

Location:
branches/UnloadJobs
Files:
2 deleted
16 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/UnloadJobs

  • branches/UnloadJobs/HeuristicLab 3.3.sln

    r8948 r9184  
    1010    PreBuildEvent.cmd = PreBuildEvent.cmd
    1111  EndProjectSection
    12 EndProject
    13 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure-3.3", "HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj", "{94186A6A-5176-4402-AE83-886557B53CCA}"
    14 EndProject
    15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
    16 EndProject
    17 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.GUI-3.3", "HeuristicLab.Persistence.GUI\3.3\HeuristicLab.Persistence.GUI-3.3.csproj", "{A9E282EA-180F-4233-B809-AEDF0787545C}"
    18 EndProject
    19 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Core-3.3", "HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj", "{C36BD924-A541-4A00-AFA8-41701378DDC5}"
    20 EndProject
    21 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
    22 EndProject
    23 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators-3.3", "HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj", "{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}"
    24 EndProject
    25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
    26 EndProject
    27 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Random-3.3", "HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj", "{F4539FB6-4708-40C9-BE64-0A1390AEA197}"
    28 EndProject
    29 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
    30 EndProject
    31 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Programmable-3.3", "HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj", "{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}"
    3212EndProject
    3313Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab-3.3", "HeuristicLab\3.3\HeuristicLab-3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}"
    … …  
    153133  EndProjectSection
    154134EndProject
     135Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure-3.3", "HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj", "{94186A6A-5176-4402-AE83-886557B53CCA}"
     136EndProject
     137Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
     138EndProject
     139Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.GUI-3.3", "HeuristicLab.Persistence.GUI\3.3\HeuristicLab.Persistence.GUI-3.3.csproj", "{A9E282EA-180F-4233-B809-AEDF0787545C}"
     140EndProject
     141Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Core-3.3", "HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj", "{C36BD924-A541-4A00-AFA8-41701378DDC5}"
     142EndProject
     143Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
     144EndProject
     145Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators-3.3", "HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj", "{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}"
     146EndProject
     147Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
     148EndProject
     149Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Random-3.3", "HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj", "{F4539FB6-4708-40C9-BE64-0A1390AEA197}"
     150EndProject
     151Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
     152EndProject
     153Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Programmable-3.3", "HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj", "{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}"
     154EndProject
    155155Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tracing-3.3", "HeuristicLab.Tracing\3.3\HeuristicLab.Tracing-3.3.csproj", "{EE2034D9-6E27-48A1-B855-42D45F69A4FC}"
    156156EndProject
    … …  
    353353Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ScatterSearch-3.3", "HeuristicLab.Algorithms.ScatterSearch\3.3\HeuristicLab.Algorithms.ScatterSearch-3.3.csproj", "{5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}"
    354354EndProject
    355 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GradientDescent", "HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent.csproj", "{1256B945-EEA9-4BE4-9880-76B5B113F089}"
     355Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GradientDescent-3.3", "HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent-3.3.csproj", "{1256B945-EEA9-4BE4-9880-76B5B113F089}"
    356356EndProject
    357357Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3", "HeuristicLab.Problems.Instances.DataAnalysis.Views\3.3\HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3.csproj", "{72232235-B6CF-4E6C-B086-9E9E11AA0717}"

  • branches/UnloadJobs/HeuristicLab.Algorithms.DataAnalysis

  • branches/UnloadJobs/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

    r9096 r9184  
    267267  </ItemGroup>
    268268  <ItemGroup>
    269     <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent.csproj">
     269    <ProjectReference Include="..\..\HeuristicLab.Algorithms.GradientDescent\3.3\HeuristicLab.Algorithms.GradientDescent-3.3.csproj">
    270270      <Project>{1256B945-EEA9-4BE4-9880-76B5B113F089}</Project>
    271271      <Name>HeuristicLab.Algorithms.GradientDescent</Name>

  • branches/UnloadJobs/HeuristicLab.Algorithms.GradientDescent/3.3/Plugin.cs.frame

    r9128 r9184  
    2323
    2424namespace HeuristicLab.Algorithms.GradientDescent {
    25   [Plugin("HeuristicLab.Algorithms.GradientDescent", "3.3.0.$WCREV$")]
     25  [Plugin("HeuristicLab.Algorithms.GradientDescent", "3.3.7.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Algorithms.GradientDescent-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.ALGLIB", "3.6.0")]

  • branches/UnloadJobs/HeuristicLab.Algorithms.GradientDescent/3.3/Properties/AssemblyInfo.cs.frame

    r8401 r9184  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("HEAL")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

  • branches/UnloadJobs/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

    r9151 r9184  
    152152    <Compile Include="Interfaces\IMultiOperator.cs" />
    153153    <Compile Include="Interfaces\IFixedValueParameter.cs" />
     154    <Compile Include="Interfaces\IOperatorGraphOperator.cs" />
    154155    <Compile Include="Interfaces\IStatefulItem.cs" />
    155156    <Compile Include="OperatorExecutionException.cs" />

  • branches/UnloadJobs/HeuristicLab.Core/3.3/OperatorGraph.cs

    r9075 r9184  
    263263        visited.Add(current);
    264264
     265        IOperatorGraphOperator operatorGraphOperator = current as IOperatorGraphOperator;
     266        if (operatorGraphOperator != null) open.Push(operatorGraphOperator.OperatorGraph.InitialOperator);
     267
    265268        foreach (var parameter in current.Parameters.OfType<IValueParameter>()) {
    266269          if (!typeof(IOperator).IsAssignableFrom(parameter.DataType)) continue;

  • branches/UnloadJobs/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs

    r8000 r9184  
    4545
    4646    public override bool ActivateTextEditor(ITextProvider textProvider) {
    47       TextEditor.GetEditor(textProvider);
    48       TextEditor.Show();
    49       return true;
     47      return false;
    5048    }
    5149

  • branches/UnloadJobs/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Ghosts.cs

    r4068 r9184  
    3535namespace HeuristicLab.Netron {
    3636  internal static class GhostsFactory {
    37     private static RectGhost mRectangular;
    38     private static LineGhost mLine;
    39     private static EllipticGhost mEllipse;
    40     private static MultiLineGhost mMultiLine;
    41     private static CurvedLineGhost mCurvedLine;
    42     private static PolygonGhost mPolygon;
    43 
    44     private static IView mView;
    45     public static IView View {
    46       get { return mView; }
    47       set { mView = value; }
    48     }
    49 
    5037    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
    51     public static IGhost GetGhost(object pars, GhostTypes type) {
     38    public static IGhost GetGhost(object pars, GhostTypes type, IView View) {
    5239      Point[] points;
    5340      switch (type) {
    5441        case GhostTypes.Rectangle:
    55           if (mRectangular == null)
    56             mRectangular = new RectGhost(View);
     42          var mRectangular = new RectGhost(View);
    5743          points = (Point[])pars;
    5844          mRectangular.Start = points[0];
    … …  
    6046          return mRectangular;
    6147        case GhostTypes.Ellipse:
    62           if (mEllipse == null)
    63             mEllipse = new EllipticGhost(View);
     48          var mEllipse = new EllipticGhost(View);
    6449          points = (Point[])pars;
    6550          mEllipse.Start = points[0];
    … …  
    6752          return mEllipse;
    6853        case GhostTypes.Line:
    69           if (mLine == null)
    70             mLine = new LineGhost(View);
     54          var mLine = new LineGhost(View);
    7155          points = (Point[])pars;
    7256          mLine.Start = points[0];
    … …  
    7458          return mLine;
    7559        case GhostTypes.MultiLine:
    76           if (mMultiLine == null)
    77             mMultiLine = new MultiLineGhost(View);
     60          var mMultiLine = new MultiLineGhost(View);
    7861          points = (Point[])pars;
    7962          mMultiLine.Points = points;
    8063          return mMultiLine;
    8164        case GhostTypes.CurvedLine:
    82           if (mCurvedLine == null)
    83             mCurvedLine = new CurvedLineGhost(View);
     65          var mCurvedLine = new CurvedLineGhost(View);
    8466          points = (Point[])pars;
    8567          mCurvedLine.Points = points;
    8668          return mCurvedLine;
    8769        case GhostTypes.Polygon:
    88           if (mPolygon == null)
    89             mPolygon = new PolygonGhost(View);
     70          var mPolygon = new PolygonGhost(View);
    9071          points = (Point[])pars;
    9172          mPolygon.Points = points;

  • branches/UnloadJobs/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj

    r8600 r9184  
    122122    <Compile Include="Plugin.cs" />
    123123    <Compile Include="Properties\AssemblyInfo.cs" />
    124     <Compile Include="TextEditor.cs" />
    125124    <Compile Include="View.cs" />
    126125  </ItemGroup>
    … …  
    171170  -->
    172171  <PropertyGroup>
    173    <PreBuildEvent>
     172    <PreBuildEvent>
    174173    </PreBuildEvent>
    175174  </PropertyGroup>

  • branches/UnloadJobs/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs

    r7259 r9184  
    4949        this.AttachToDocument(Document);
    5050        this.Controller.View = View;
    51         TextEditor.Init(this);
    5251
    5352        View.OnCursorChange += new EventHandler<CursorEventArgs>(mView_OnCursorChange);

  • branches/UnloadJobs/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/View.cs

    r4068 r9184  
    4242      this.HorizontalRuler.Visible = true;
    4343      this.VerticalRuler.Visible = true;
    44       GhostsFactory.View = this;
    4544    }
    4645
    … …  
    102101      Ghost = GhostsFactory.GetGhost(
    103102          new Point[] { ltPoint, rbPoint },
    104               GhostTypes.Ellipse);
     103              GhostTypes.Ellipse, this);
    105104    }
    106105    public override void PaintGhostRectangle(
    … …  
    112111      Ghost = GhostsFactory.GetGhost(
    113112          new Point[] { ltPoint, rbPoint },
    114           GhostTypes.Rectangle);
     113          GhostTypes.Rectangle, this);
    115114    }
    116115    public override void PaintAntsRectangle(
    … …  
    129128      Ghost = GhostsFactory.GetGhost(
    130129          new Point[] { ltPoint, rbPoint },
    131           GhostTypes.Line);
     130          GhostTypes.Line, this);
    132131    }
    133132    public override void PaintGhostLine(
    … …  
    139138      switch (curveType) {
    140139        case MultiPointType.Straight:
    141           Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine);
     140          Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine, this);
    142141          break;
    143142        case MultiPointType.Polygon:
    144           Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon);
     143          Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon, this);
    145144          break;
    146145        case MultiPointType.Curve:
    147           Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine);
     146          Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine, this);
    148147          break;
    149148

  • branches/UnloadJobs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

    r7259 r9184  
    6363      if (InvokeRequired) Invoke((Action)RefreshMenuItems);
    6464      else {
     65        foreach (ToolStripMenuItem m in menuItems.Values)
     66          m.Dispose();
    6567        this.Items.Clear();
    6668        this.menuItems.Clear();

  • branches/UnloadJobs/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

    r9183 r9184  
    6666      //
    6767      this.viewsLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     68      this.viewsLabel.ContextMenuStrip = this.viewContextMenuStrip;
    6869      this.viewsLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Windows;
    6970      this.viewsLabel.Location = new System.Drawing.Point(211, 0);

  • branches/UnloadJobs/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

    r7259 r9184  
    3131  [Item("AlgorithmOperator", "An operator which represents an algorithm represented as an operator graph.")]
    3232  [StorableClass]
    33   public abstract class AlgorithmOperator : SingleSuccessorOperator {
     33  public abstract class AlgorithmOperator : SingleSuccessorOperator, IOperatorGraphOperator {
    3434    public static new Image StaticItemImage {
    3535      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
Note: See TracChangeset for help on using the changeset viewer.