Context Navigation

← Previous Change
Next Change →

HeuristicLab.Optimizer

Timestamp:

03/28/19 16:54:20 (6 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:

: 45 edited

. (modified) (1 prop)
HeuristicLab.Optimizer (modified) (1 prop)
HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/CreateExperimentDialog.Designer.cs (modified) (11 diffs)
HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (6 diffs)
HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (2 diffs)
HeuristicLab.Optimizer/3.3/IOptimizerUserInterfaceItemProvider.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MainFormTypeSelectionDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MainFormTypeSelectionDialog.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ChangeMainFormTypeMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ChangeMainFormTypeSeperator.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ChangeNestingLevelMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ClipboardMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ConvertIntoUserDefinedAlgorithmMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/CopyToClipboardMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/CreateExperimentMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/Separators.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/StartPageMenuItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs (modified) (3 diffs)
HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/Plugin.cs.frame (modified) (3 diffs)
HeuristicLab.Optimizer/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
HeuristicLab.Optimizer/3.3/StartPage.Designer.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (4 diffs)
HeuristicLab.Optimizer/3.3/ToolBarItems/NewToolBarItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/ToolBarItems/OpenToolBarItem.cs (modified) (1 diff)
HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration (added)	merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2892_LR-prediction-intervals (added)	merged: 15743-15744,16388
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/2947_ConfigurableIndexedDataTable (added)	merged: 16148-16150,16156,16520,16524
/branches/2965_CancelablePersistence (added)	merged: 16321,16325,16433,16439
/branches/2972_PDPRowSelect (added)	merged: 16444-16445,16516-16518
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382,16389,16392,16394,16407,16415,16422,16427,16430-16431,16440-16441,16443,16446,16448-16449,16478,16491,16494,16496,16499,16501-16506,16511-16513,16519,16526-16528,16542-16543,16565,16568-16569,16571-16572,16578-16579,16584-16585,16594-16595,16619,16622-16626,16629,16631,16646,16648,16651,16656,16658-16659,16661,16668,16670,16672,16681,16700-16704,16706-16707,16716
/trunk/sources	merged: 15682-15683

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration/HeuristicLab.Optimizer (added)	merged: 16452-16454,16462,16529,16539,16558-16559
/branches/2839_HiveProjectManagement/HeuristicLab.Optimizer (added)	merged: 16057
/branches/2892_LR-prediction-intervals/HeuristicLab.Optimizer (added)	merged: 16388
/branches/2915-AbsoluteSymbol/HeuristicLab.Optimizer (added)	merged: 16240
/branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Optimizer (added)	merged: 16520
/branches/2965_CancelablePersistence/HeuristicLab.Optimizer (added)	merged: 16325,16433
/branches/2972_PDPRowSelect/HeuristicLab.Optimizer (added)	merged: 16518
/branches/HiveProjectManagement/HeuristicLab.Optimizer (added)	merged: 15401
/trunk/HeuristicLab.Optimizer (added)	merged: 16117,16356,16389,16430,16440,16506,16519,16527,16565,16568,16585,16625,16658

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/ChangeNestingLevelDialog.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.Designer.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       // repetitionsNumericUpDown
       //
       this.repetitionsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.repetitionsNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.repetitionsNumericUpDown.Location = new System.Drawing.Point(113, 28);
 …
       // tabControl
       //
       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.parametersTabPage);
 …
       // parametersTabPage
       //
+      this.parametersTabPage.BackColor = System.Drawing.SystemColors.Window;
       this.parametersTabPage.Controls.Add(this.parametersSplitContainer);
       this.parametersTabPage.Location = new System.Drawing.Point(4, 22);
 …
       this.parametersTabPage.TabIndex = 1;
       this.parametersTabPage.Text = "Parameter Variations";
-      this.parametersTabPage.UseVisualStyleBackColor = true;
       //
       // parametersSplitContainer
 …
       // stringConvertibleArrayView
       //
       this.stringConvertibleArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
+      this.stringConvertibleArrayView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.stringConvertibleArrayView.Caption = "StringConvertibleArray View";
 …
       // choicesListView
       //
       this.choicesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
+      this.choicesListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.choicesListView.CheckBoxes = true;
 …
       // instancesTabPage
       //
+      this.instancesTabPage.BackColor = System.Drawing.SystemColors.Window;
       this.instancesTabPage.Controls.Add(this.label1);
       this.instancesTabPage.Controls.Add(this.instanceDiscoveryProgressBar);
 …
       this.instancesTabPage.TabIndex = 0;
       this.instancesTabPage.Text = "Problem Instances";
-      this.instancesTabPage.UseVisualStyleBackColor = true;
       //
       // label1
 …
       // instancesTreeView
       //
       this.instancesTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
+      this.instancesTreeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.instancesTreeView.CheckBoxes = true;
 …
       // experimentCreationProgressBar
       //
       this.experimentCreationProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+      this.experimentCreationProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.experimentCreationProgressBar.Location = new System.Drawing.Point(187, 377);

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/FileManager.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Windows.Forms;
 using HeuristicLab.Common;
 …
         if (view == null)
           ErrorHandling.ShowErrorDialog("There is no view for the loaded item. It cannot be displayed.", new InvalidOperationException("No View Available"));
+      }
+      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, "Cannot open file.", ex);
+      }
+      finally {
+      } finally {
         ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).ResetAppStartingCursor();
+      }
 …
         else {
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
+          SetSaveOperationProgressInContentViews(content, true);
+          ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
+          var cancellationTokenSource = new CancellationTokenSource();
+          AddProgressInContentViews(content, cancellationTokenSource);
+          ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted, cancellationTokenSource.Token);
+        }
+      }
 …
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
           MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().SetAppStartingCursor();
+          SetSaveOperationProgressInContentViews(content, true, saveFileDialog.FileName);
+          if (saveFileDialog.FilterIndex == 1) {
+            ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
+          } else {
+            ContentManager.SaveAsync(content, saveFileDialog.FileName, true, SavingCompleted);
+          }
+          bool compressed = saveFileDialog.FilterIndex != 1;
+          var cancellationTokenSource = new CancellationTokenSource();
+          AddProgressInContentViews(content, cancellationTokenSource, saveFileDialog.FileName);
+          ContentManager.SaveAsync(content, saveFileDialog.FileName, compressed, SavingCompleted, cancellationTokenSource.Token);
+        }
+      }
 …
         if (error != null) throw error;
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle();
+      }
       catch (Exception ex) {
+      } catch (OperationCanceledException) { // do nothing if canceled
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, "Cannot save file.", ex);
+      }
+      finally {
+        SetSaveOperationProgressInContentViews(content, false);
+      } finally {
+        Progress.Hide(content);
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().ResetAppStartingCursor();
+      }
+    }
+    private static void SetSaveOperationProgressInContentViews(IStorableContent content, bool showProgress, string fileName = null) {
+      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>();
+      #region Mono Compatibility
+      // removed the InvokeRequired check because of Mono
+      mainForm.Invoke((Action)delegate {
+        if (showProgress) {
+          mainForm.AddOperationProgressToContent(content, string.Format("Saving to file \"{0}\"...", Path.GetFileName(fileName ?? content.Filename)));
+        } else
+          mainForm.RemoveOperationProgressFromContent(content);
+      });
+      #endregion
+    private static void AddProgressInContentViews(IStorableContent content, CancellationTokenSource cancellationTokenSource, string fileName = null) {
+      string message = string.Format("Saving to file \"{0}\"...", Path.GetFileName(fileName ?? content.Filename));
+      Progress.Show(content, message, ProgressMode.Indeterminate, cancelRequestHandler: () => cancellationTokenSource.Cancel());
+    }
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

-                      r16692
+                      r16723
     <RootNamespace>HeuristicLab.Optimizer</RootNamespace>
     <AssemblyName>HeuristicLab.Optimizer-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
 …
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/IOptimizerUserInterfaceItemProvider.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MainFormTypeSelectionDialog.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MainFormTypeSelectionDialog.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/AboutMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ChangeMainFormTypeMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ChangeMainFormTypeSeperator.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ChangeNestingLevelMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ClipboardMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ConvertIntoUserDefinedAlgorithmMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/CopyToClipboardMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/CreateExperimentMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/Separators.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/StartPageMenuItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Collections.Generic;
 using System.Windows.Forms;
+using HeuristicLab.Clients.Access;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.MainForm;
 …
       using (PasswordDialog dialog = new PasswordDialog()) {
         dialog.ShowDialog((IWin32Window)MainFormManager.MainForm);
+        UserInformation.Instance.Refresh();
+      }
+    }

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/NewItemDialog.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/Plugin.cs.frame

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   [Plugin("HeuristicLab.Optimizer", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.Optimizer-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Clients.Access", "3.3")]
   [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
 …
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
-  [PluginDependency("HeuristicLab.Clients.Access", "3.3")]
   public class HeuristicLabOptimizerPlugin : PluginBase {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/Properties/AssemblyInfo.cs.frame

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/StartPage.Designer.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/StartPage.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     private void LoadSamples(object state) {
       progress = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(samplesListView, "Loading...");
+      progress = Progress.ShowOnControl(samplesListView, "Loading...");
       try {
         var assembly = Assembly.GetExecutingAssembly();
 …
         OnAllSamplesLoaded();
       } finally {
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(samplesListView);
+        Progress.HideFromControl(samplesListView);
+      }
+    }
 …
         };
       groupLookup[standardProblemsGroup] = standardProblems;
       var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg","OSGP_SymReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
+      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_SymReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
       groupLookup[dataAnalysisGroup] = dataAnalysisProblems;
       var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script",

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/ToolBarItems/NewToolBarItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/ToolBarItems/OpenToolBarItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Optimizer

Legend:

Download in other formats: