Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 16:54:20 (5 years ago)
Author:
abeham
Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

  • it doesn't build
Location:
branches/2521_ProblemRefactoring
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj

    r13449 r16723  
    1111    <RootNamespace>HeuristicLab.Problems.Scheduling.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.Scheduling.Views-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.Designer.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 //using HeuristicLab.Encodings.ScheduleEncoding.Views;
    23 //namespace HeuristicLab.Problems.Scheduling.Views {
    24 //  partial class JobShopSchedulingProblemView {
    25 //    /// <summary>
    26 //    /// Required designer variable.
    27 //    /// </summary>
    28 //    private System.ComponentModel.IContainer components = null;
     22using HeuristicLab.Encodings.ScheduleEncoding.Views;
     23namespace HeuristicLab.Problems.Scheduling.Views {
     24  partial class JobShopSchedulingProblemView {
     25    /// <summary>
     26    /// Required designer variable.
     27    /// </summary>
     28    private System.ComponentModel.IContainer components = null;
    2929
    30 //    /// <summary>
    31 //    /// Clean up any resources being used.
    32 //    /// </summary>
    33 //    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
    34 //    protected override void Dispose(bool disposing) {
    35 //      if (disposing && (components != null)) {
    36 //        components.Dispose();
    37 //      }
    38 //      base.Dispose(disposing);
    39 //    }
     30    /// <summary>
     31    /// Clean up any resources being used.
     32    /// </summary>
     33    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     34    protected override void Dispose(bool disposing) {
     35      if (disposing && (components != null)) {
     36        components.Dispose();
     37      }
     38      base.Dispose(disposing);
     39    }
    4040
    41 //    #region Component Designer generated code
     41    #region Component Designer generated code
    4242
    43 //    /// <summary>
    44 //    /// Required method for Designer support - do not modify
    45 //    /// the contents of this method with the code editor.
    46 //    /// </summary>
    47 //    private void InitializeComponent() {
    48 //      this.problemTabControl = new System.Windows.Forms.TabControl();
    49 //      this.problemTabPage = new System.Windows.Forms.TabPage();
    50 //      this.visualizationTabPage = new System.Windows.Forms.TabPage();
    51 //      this.ganttChart = new HeuristicLab.Encodings.ScheduleEncoding.Views.GanttChart();
    52 //      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
    53 //      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
    54 //      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
    55 //      this.problemInstanceSplitContainer.SuspendLayout();
    56 //      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    57 //      this.problemTabControl.SuspendLayout();
    58 //      this.problemTabPage.SuspendLayout();
    59 //      this.visualizationTabPage.SuspendLayout();
    60 //      this.SuspendLayout();
    61 //      //
    62 //      // problemInstanceSplitContainer.Panel2
    63 //      //
    64 //      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.problemTabControl);
    65 //      //
    66 //      // parameterCollectionView
    67 //      //
    68 //      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
    69 //      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
    70 //      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
    71 //      this.parameterCollectionView.Size = new System.Drawing.Size(491, 271);
    72 //      //
    73 //      // nameTextBox
    74 //      //
    75 //      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    76 //      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    77 //      this.nameTextBox.Size = new System.Drawing.Size(439, 20);
    78 //      //
    79 //      // infoLabel
    80 //      //
    81 //      this.infoLabel.Location = new System.Drawing.Point(492, 3);
    82 //      //
    83 //      // problemTabControl
    84 //      //
    85 //      this.problemTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    86 //            | System.Windows.Forms.AnchorStyles.Left)
    87 //            | System.Windows.Forms.AnchorStyles.Right)));
    88 //      this.problemTabControl.Controls.Add(this.problemTabPage);
    89 //      this.problemTabControl.Controls.Add(this.visualizationTabPage);
    90 //      this.problemTabControl.Location = new System.Drawing.Point(3, 27);
    91 //      this.problemTabControl.Name = "problemTabControl";
    92 //      this.problemTabControl.SelectedIndex = 0;
    93 //      this.problemTabControl.Size = new System.Drawing.Size(505, 303);
    94 //      this.problemTabControl.TabIndex = 5;
    95 //      //
    96 //      // problemTabPage
    97 //      //
    98 //      this.problemTabPage.Controls.Add(this.parameterCollectionView);
    99 //      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
    100 //      this.problemTabPage.Name = "problemTabPage";
    101 //      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
    102 //      this.problemTabPage.Size = new System.Drawing.Size(497, 277);
    103 //      this.problemTabPage.TabIndex = 0;
    104 //      this.problemTabPage.Text = "Problem";
    105 //      this.problemTabPage.UseVisualStyleBackColor = true;
    106 //      //
    107 //      // visualizationTabPage
    108 //      //
    109 //      this.visualizationTabPage.Controls.Add(this.ganttChart);
    110 //      this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
    111 //      this.visualizationTabPage.Name = "visualizationTabPage";
    112 //      this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
    113 //      this.visualizationTabPage.Size = new System.Drawing.Size(497, 277);
    114 //      this.visualizationTabPage.TabIndex = 1;
    115 //      this.visualizationTabPage.Text = "Visualization";
    116 //      this.visualizationTabPage.UseVisualStyleBackColor = true;
    117 //      //
    118 //      // ganttChart
    119 //      //
    120 //      this.ganttChart.Dock = System.Windows.Forms.DockStyle.Fill;
    121 //      this.ganttChart.Location = new System.Drawing.Point(3, 3);
    122 //      this.ganttChart.Name = "ganttChart";
    123 //      this.ganttChart.Size = new System.Drawing.Size(491, 271);
    124 //      this.ganttChart.TabIndex = 0;
    125 //      //
    126 //      // JobShopSchedulingProblemView
    127 //      //
    128 //      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    129 //      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    130 //      this.Name = "JobShopSchedulingProblemView";
    131 //      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
    132 //      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
    133 //      this.problemInstanceSplitContainer.Panel2.PerformLayout();
    134 //      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
    135 //      this.problemInstanceSplitContainer.ResumeLayout(false);
    136 //      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    137 //      this.problemTabControl.ResumeLayout(false);
    138 //      this.problemTabPage.ResumeLayout(false);
    139 //      this.visualizationTabPage.ResumeLayout(false);
    140 //      this.ResumeLayout(false);
     43    /// <summary>
     44    /// Required method for Designer support - do not modify
     45    /// the contents of this method with the code editor.
     46    /// </summary>
     47    private void InitializeComponent() {
     48      this.problemTabControl = new System.Windows.Forms.TabControl();
     49      this.problemTabPage = new System.Windows.Forms.TabPage();
     50      this.visualizationTabPage = new System.Windows.Forms.TabPage();
     51      this.ganttChart = new HeuristicLab.Encodings.ScheduleEncoding.Views.GanttChart();
     52      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
     53      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
     54      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
     55      this.problemInstanceSplitContainer.SuspendLayout();
     56      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     57      this.problemTabControl.SuspendLayout();
     58      this.problemTabPage.SuspendLayout();
     59      this.visualizationTabPage.SuspendLayout();
     60      this.SuspendLayout();
     61      //
     62      // problemInstanceSplitContainer.Panel2
     63      //
     64      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.problemTabControl);
     65      //
     66      // parameterCollectionView
     67      //
     68      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     69      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
     70      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
     71      this.parameterCollectionView.Size = new System.Drawing.Size(491, 271);
     72      //
     73      // nameTextBox
     74      //
     75      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     76      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
     77      this.nameTextBox.Size = new System.Drawing.Size(439, 20);
     78      //
     79      // infoLabel
     80      //
     81      this.infoLabel.Location = new System.Drawing.Point(492, 3);
     82      //
     83      // problemTabControl
     84      //
     85      this.problemTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     86            | System.Windows.Forms.AnchorStyles.Left)
     87            | System.Windows.Forms.AnchorStyles.Right)));
     88      this.problemTabControl.Controls.Add(this.problemTabPage);
     89      this.problemTabControl.Controls.Add(this.visualizationTabPage);
     90      this.problemTabControl.Location = new System.Drawing.Point(3, 27);
     91      this.problemTabControl.Name = "problemTabControl";
     92      this.problemTabControl.SelectedIndex = 0;
     93      this.problemTabControl.Size = new System.Drawing.Size(505, 303);
     94      this.problemTabControl.TabIndex = 5;
     95      //
     96      // problemTabPage
     97      //
     98      this.problemTabPage.BackColor = System.Drawing.SystemColors.Window;
     99      this.problemTabPage.Controls.Add(this.parameterCollectionView);
     100      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
     101      this.problemTabPage.Name = "problemTabPage";
     102      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
     103      this.problemTabPage.Size = new System.Drawing.Size(497, 277);
     104      this.problemTabPage.TabIndex = 0;
     105      this.problemTabPage.Text = "Problem";
     106      //
     107      // visualizationTabPage
     108      //
     109      this.visualizationTabPage.BackColor = System.Drawing.SystemColors.Window;
     110      this.visualizationTabPage.Controls.Add(this.ganttChart);
     111      this.visualizationTabPage.Location = new System.Drawing.Point(4, 22);
     112      this.visualizationTabPage.Name = "visualizationTabPage";
     113      this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
     114      this.visualizationTabPage.Size = new System.Drawing.Size(497, 277);
     115      this.visualizationTabPage.TabIndex = 1;
     116      this.visualizationTabPage.Text = "Visualization";
     117      //
     118      // ganttChart
     119      //
     120      this.ganttChart.Dock = System.Windows.Forms.DockStyle.Fill;
     121      this.ganttChart.Location = new System.Drawing.Point(3, 3);
     122      this.ganttChart.Name = "ganttChart";
     123      this.ganttChart.Size = new System.Drawing.Size(491, 271);
     124      this.ganttChart.TabIndex = 0;
     125      //
     126      // JobShopSchedulingProblemView
     127      //
     128      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     129      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     130      this.Name = "JobShopSchedulingProblemView";
     131      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
     132      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
     133      this.problemInstanceSplitContainer.Panel2.PerformLayout();
     134      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
     135      this.problemInstanceSplitContainer.ResumeLayout(false);
     136      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     137      this.problemTabControl.ResumeLayout(false);
     138      this.problemTabPage.ResumeLayout(false);
     139      this.visualizationTabPage.ResumeLayout(false);
     140      this.ResumeLayout(false);
    141141
    142 //    }
     142    }
    143143
    144 //    #endregion
     144    #endregion
    145145
    146 //    private System.Windows.Forms.TabControl problemTabControl;
    147 //    private System.Windows.Forms.TabPage problemTabPage;
    148 //    private System.Windows.Forms.TabPage visualizationTabPage;
    149 //    private GanttChart ganttChart;
    150 //  }
    151 //}
     146    private System.Windows.Forms.TabControl problemTabControl;
     147    private System.Windows.Forms.TabPage problemTabPage;
     148    private System.Windows.Forms.TabPage visualizationTabPage;
     149    private GanttChart ganttChart;
     150  }
     151}

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling.Views/3.3/Plugin.cs.frame

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling.Views/3.3/Properties/AssemblyInfo.cs.frame

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.