Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab 3.3.sln
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab 3.3.sln (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab 3.3.sln (revision 16373)
@@ -86,4 +86,5 @@
{9D792B6D-836B-46DC-9D69-50B4B1E7B87F} = {9D792B6D-836B-46DC-9D69-50B4B1E7B87F}
{399EBB6E-37A1-4AE4-B8CD-0D461FF286A3} = {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}
+ {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909} = {FA3B9270-48B7-4C77-9FEA-2A6EDE82E909}
{3C906172-E044-4DF0-B4FD-AA21192D5D3E} = {3C906172-E044-4DF0-B4FD-AA21192D5D3E}
{DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (revision 16373)
@@ -35,4 +35,5 @@
public const string PopulationBasedAlgorithms = Algorithms + SplitToken + "1" + OrderToken + "Population Based";
public const string SingleSolutionAlgorithms = Algorithms + SplitToken + "2" + OrderToken + "Single Solution";
+ public const string ExactAlgorithms = Algorithms + SplitToken + "3" + OrderToken + "Exact";
public const string Problems = "2" + OrderToken + "Problems";
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (revision 16373)
@@ -221,4 +221,10 @@
StringConvertibleMatrixView.cs
+
+ UserControl
+
+
+ TextValueView.cs
+
UserControl
@@ -290,4 +296,9 @@
true
+
+
+
+ TextValueView.cs
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.Designer.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.Designer.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.Designer.cs (revision 16373)
@@ -0,0 +1,133 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.Data.Views {
+ partial class TextValueView {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing) {
+ if (disposing) {
+ if (components != null) components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent() {
+ this.components = new System.ComponentModel.Container();
+ this.valueTextBox = new System.Windows.Forms.TextBox();
+ this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+ this.valueLabel = new System.Windows.Forms.Label();
+ this.splitContainer = new System.Windows.Forms.SplitContainer();
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+ this.splitContainer.Panel1.SuspendLayout();
+ this.splitContainer.Panel2.SuspendLayout();
+ this.splitContainer.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // valueTextBox
+ //
+ this.valueTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.valueTextBox.Location = new System.Drawing.Point(0, 0);
+ this.valueTextBox.Multiline = true;
+ this.valueTextBox.Name = "valueTextBox";
+ this.valueTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
+ this.valueTextBox.Size = new System.Drawing.Size(194, 40);
+ this.valueTextBox.TabIndex = 2;
+ this.valueTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.valueTextBox_KeyDown);
+ this.valueTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.valueTextBox_Validating);
+ this.valueTextBox.Validated += new System.EventHandler(this.valueTextBox_Validated);
+ //
+ // errorProvider
+ //
+ this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+ this.errorProvider.ContainerControl = this;
+ //
+ // valueLabel
+ //
+ this.valueLabel.AutoSize = true;
+ this.valueLabel.Location = new System.Drawing.Point(3, 3);
+ this.valueLabel.Name = "valueLabel";
+ this.valueLabel.Size = new System.Drawing.Size(37, 13);
+ this.valueLabel.TabIndex = 1;
+ this.valueLabel.Text = "&Value:";
+ //
+ // splitContainer
+ //
+ this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+ this.splitContainer.IsSplitterFixed = true;
+ this.splitContainer.Location = new System.Drawing.Point(0, 0);
+ this.splitContainer.Name = "splitContainer";
+ this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
+ //
+ // splitContainer.Panel1
+ //
+ this.splitContainer.Panel1.Controls.Add(this.valueLabel);
+ this.splitContainer.Panel1MinSize = 19;
+ //
+ // splitContainer.Panel2
+ //
+ this.splitContainer.Panel2.Controls.Add(this.valueTextBox);
+ this.splitContainer.Size = new System.Drawing.Size(194, 60);
+ this.splitContainer.SplitterDistance = 19;
+ this.splitContainer.SplitterWidth = 1;
+ this.splitContainer.TabIndex = 0;
+ this.splitContainer.TabStop = false;
+ //
+ // TextValueView
+ //
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+ this.Controls.Add(this.splitContainer);
+ this.Name = "TextValueView";
+ this.Size = new System.Drawing.Size(194, 60);
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+ this.splitContainer.Panel1.ResumeLayout(false);
+ this.splitContainer.Panel1.PerformLayout();
+ this.splitContainer.Panel2.ResumeLayout(false);
+ this.splitContainer.Panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+ this.splitContainer.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ protected System.Windows.Forms.TextBox valueTextBox;
+ protected System.Windows.Forms.ErrorProvider errorProvider;
+ protected System.Windows.Forms.Label valueLabel;
+ protected System.Windows.Forms.SplitContainer splitContainer;
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.cs (revision 16373)
@@ -0,0 +1,112 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
+
+namespace HeuristicLab.Data.Views {
+ [View("TextValue View")]
+ [Content(typeof(ITextValue), true)]
+ public partial class TextValueView : AsynchronousContentView {
+ public new IStringConvertibleValue Content {
+ get { return (IStringConvertibleValue)base.Content; }
+ set { base.Content = value; }
+ }
+
+ public override bool ReadOnly {
+ get {
+ if ((Content != null) && Content.ReadOnly) return true;
+ return base.ReadOnly;
+ }
+ set { base.ReadOnly = value; }
+ }
+
+ public bool LabelVisible {
+ get { return !splitContainer.Panel1Collapsed; }
+ set { splitContainer.Panel1Collapsed = !value; }
+ }
+
+ public TextValueView() {
+ InitializeComponent();
+ errorProvider.SetIconAlignment(valueTextBox, ErrorIconAlignment.MiddleLeft);
+ errorProvider.SetIconPadding(valueTextBox, 2);
+ }
+
+ protected override void DeregisterContentEvents() {
+ Content.ValueChanged -= new EventHandler(Content_ValueChanged);
+ base.DeregisterContentEvents();
+ }
+
+ protected override void RegisterContentEvents() {
+ base.RegisterContentEvents();
+ Content.ValueChanged += new EventHandler(Content_ValueChanged);
+ }
+
+ protected override void OnContentChanged() {
+ base.OnContentChanged();
+ if (Content == null) {
+ valueTextBox.Text = string.Empty;
+ } else
+ valueTextBox.Text = Content.GetValue();
+ }
+
+ protected override void SetEnabledStateOfControls() {
+ base.SetEnabledStateOfControls();
+ valueTextBox.Enabled = Content != null;
+ valueTextBox.ReadOnly = ReadOnly;
+ }
+
+ protected virtual void Content_ValueChanged(object sender, EventArgs e) {
+ if (InvokeRequired)
+ Invoke(new EventHandler(Content_ValueChanged), sender, e);
+ else
+ valueTextBox.Text = Content.GetValue();
+ }
+
+ protected virtual void valueTextBox_KeyDown(object sender, KeyEventArgs e) {
+ if (e.Shift && (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return))
+ valueLabel.Select(); // select label to validate data
+
+ if (e.KeyCode == Keys.Escape) {
+ valueTextBox.Text = Content.GetValue();
+ valueLabel.Select(); // select label to validate data
+ }
+ }
+ protected virtual void valueTextBox_Validating(object sender, CancelEventArgs e) {
+ if (ReadOnly) return;
+ string errorMessage;
+ if (!Content.Validate(valueTextBox.Text, out errorMessage)) {
+ e.Cancel = true;
+ errorProvider.SetError(valueTextBox, errorMessage);
+ valueTextBox.SelectAll();
+ }
+ }
+ protected virtual void valueTextBox_Validated(object sender, EventArgs e) {
+ if (ReadOnly) return;
+ if (!Content.ReadOnly) Content.SetValue(valueTextBox.Text);
+ errorProvider.SetError(valueTextBox, string.Empty);
+ valueTextBox.Text = Content.GetValue();
+ }
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.resx
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.resx (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.resx (revision 16373)
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (revision 16373)
@@ -124,4 +124,5 @@
+
@@ -151,4 +152,5 @@
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs (revision 16373)
@@ -0,0 +1,28 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System;
+using HeuristicLab.Common;
+
+namespace HeuristicLab.Data {
+ public interface ITextValue : IStringConvertibleValue {
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs (revision 16373)
@@ -0,0 +1,54 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
+namespace HeuristicLab.Data {
+ [Item("TextValue", "Represents a multiline string.")]
+ [StorableClass]
+ public class TextValue : StringValue, ITextValue {
+
+ public TextValue() {
+ this.value = string.Empty;
+ this.readOnly = false;
+ }
+
+ public TextValue(string value) {
+ this.value = value ?? string.Empty;
+ this.readOnly = false;
+ }
+
+ [StorableConstructor]
+ protected TextValue(bool deserializing) : base(deserializing) { }
+
+ protected TextValue(TextValue original, Cloner cloner)
+ : base(original, cloner) {
+ this.value = original.value ?? string.Empty;
+ this.readOnly = original.readOnly;
+ }
+
+ public override IDeepCloneable Clone(Cloner cloner) {
+ return new TextValue(this, cloner);
+ }
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs.sln
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs.sln (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs.sln (revision 16373)
@@ -75,5 +75,5 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.IGraph-0.8.0-pre", "HeuristicLab.ExtLibs\HeuristicLab.Igraph\0.8.0-pre\HeuristicLab.Igraph-0.8.0-pre\HeuristicLab.IGraph-0.8.0-pre.csproj", "{088D34F2-32EA-43FF-BAA8-22428D5B66BE}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OrTools-6.9.0-pre", "HeuristicLab.ExtLibs\HeuristicLab.OrTools\6.9.0-pre\HeuristicLab.OrTools-6.9.0-pre\HeuristicLab.OrTools-6.9.0-pre.csproj", "{AEC895BC-C519-49D3-9A94-6B1C71AD6671}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.OrTools-6.10.0", "HeuristicLab.ExtLibs\HeuristicLab.OrTools\6.10.0\HeuristicLab.OrTools-6.10.0\HeuristicLab.OrTools-6.10.0.csproj", "{AEC895BC-C519-49D3-9A94-6B1C71AD6671}"
EndProject
Global
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools-license.txt
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools-license.txt (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools-license.txt (revision 16373)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2010 Google Inc
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools_version.txt
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools_version.txt (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools_version.txt (revision 16373)
@@ -0,0 +1,6 @@
+This version of Google OR-Tools is a custom build of a commit [1] in the
+runtimelinking branch of the Google OR-Tools C++ library available at
+GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
+
+[1]: https://github.com/ddorfmeister/or-tools/commit/62b433751564a627416143c3ba9469d855c098de
+[2]: https://github.com/google/or-tools
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj (revision 16373)
@@ -0,0 +1,163 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {AEC895BC-C519-49D3-9A94-6B1C71AD6671}
+ Library
+ Properties
+ HeuristicLab.OrTools
+ HeuristicLab.OrTools-6.10.0
+ v4.6.1
+ 512
+
+
+
+
+ true
+ full
+ false
+ ..\..\..\..\bin\
+ DEBUG;TRACE
+ prompt
+ 4
+ true
+ AllRules.ruleset
+
+
+ pdbonly
+ true
+ ..\..\..\..\bin\
+ TRACE
+ prompt
+ 4
+ true
+
+
+ true
+
+
+ HeuristicLab.snk
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ true
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ true
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+ False
+ .\Google.OrTools.dll
+
+
+ False
+ .\Google.Protobuf.dll
+
+
+ False
+ ..\..\..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+ Always
+
+
+ PreserveNewest
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ PreserveNewest
+
+
+ Always
+
+
+
+
+ set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Plugin.cs.frame (revision 16373)
@@ -0,0 +1,74 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using HeuristicLab.PluginInfrastructure;
+
+namespace HeuristicLab.OrTools {
+
+ [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.10.0.$WCREV$")]
+ [PluginFile("HeuristicLab.OrTools-6.10.0.dll", PluginFileType.Assembly)]
+ [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
+ [PluginFile("Google.OrTools-license.txt", PluginFileType.License)]
+ [PluginFile("Google.OrTools.runtime.win-x64.dll", PluginFileType.NativeDll)]
+ [PluginFile("Google.OrTools_version.txt", PluginFileType.Data)]
+ [PluginFile("Google.Protobuf.dll", PluginFileType.Assembly)]
+ [PluginFile("glpk_4_65.dll", PluginFileType.NativeDll)]
+ [PluginFile("glpk-license.txt", PluginFileType.License)]
+ public class HeuristicLabOrToolsPlugin : PluginBase {
+
+ ~HeuristicLabOrToolsPlugin() {
+ OnUnload(); // HACK: remove once ticket #2961 is resolved
+ }
+
+ public override void OnUnload() {
+ base.OnUnload();
+
+ var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
+ if (dllDir == null)
+ return;
+
+ var nativeDlls = GetType().GetCustomAttributes(typeof(PluginFileAttribute), true)
+ .Cast()
+ .Where(pf => pf.FileType == PluginFileType.NativeDll)
+ .Select(pf => pf.FileName);
+
+ foreach (var nativeDll in dllDir.EnumerateFiles().Where(f => nativeDlls.Contains(f.Name))) {
+ var handle = LoadLibrary(nativeDll.FullName);
+ if (handle == IntPtr.Zero)
+ continue;
+
+ FreeLibrary(handle); // close handle obtained above
+ FreeLibrary(handle); // close implicitly obtained handle
+ }
+ }
+
+ [DllImport("kernel32.dll", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ private static extern bool FreeLibrary(IntPtr hModule);
+
+ [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Ansi)]
+ private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)]string lpFileName);
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Properties/AssemblyInfo.cs.frame
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Properties/AssemblyInfo.cs.frame (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Properties/AssemblyInfo.cs.frame (revision 16373)
@@ -0,0 +1,56 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HeuristicLab.OrTools")]
+[assembly: AssemblyDescription("Plugin for providing Google OR-Tools functionality in HeuristicLab")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HEAL")]
+[assembly: AssemblyProduct("HeuristicLab")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("D7426305-B35E-47AF-8B19-7081C4AB76D3")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("6.10.0.0")]
+[assembly: AssemblyFileVersion("6.10.0.$WCREV$")]
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/glpk-license.txt
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/glpk-license.txt (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/glpk-license.txt (revision 16373)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/packages.config
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/packages.config (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/packages.config (revision 16373)
@@ -0,0 +1,5 @@
+
+
+
+
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.MathematicalOptimization-3.3.csproj
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.MathematicalOptimization-3.3.csproj (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.MathematicalOptimization-3.3.csproj (revision 16373)
@@ -115,7 +115,7 @@
..\..\bin\Google.OrTools.dll
-
+
False
- ..\..\bin\HeuristicLab.OrTools-6.9.0-pre.dll
+ ..\..\bin\HeuristicLab.OrTools-6.10.0.dll
@@ -136,23 +136,23 @@
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
UserControl
@@ -161,5 +161,6 @@
LinearProgrammingProblemDefinitionScriptView.cs
-
+
+
UserControl
@@ -175,4 +176,5 @@
ScriptTemplates.resx
+
@@ -181,5 +183,7 @@
Settings.settings
-
+
+ Designer
+
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingAlgorithm.cs (revision 16373)
@@ -35,6 +35,7 @@
namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms {
- [Item("Linear/Mixed Integer Programming (LP/MIP)", "")]
- [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
+ [Item("Linear/Mixed Integer Programming (LP/MIP)", "Linear/mixed integer programming implemented in several solvers. " +
+ "See also https://dev.heuristiclab.com/trac.fcgi/wiki/Documentation/Howto/LinearMixedIntegerProgramming")] // TODO: update link
+ [Creatable(CreatableAttribute.Categories.ExactAlgorithms)]
[StorableClass]
public class LinearProgrammingAlgorithm : BasicAlgorithm {
@@ -53,5 +54,5 @@
[Storable]
- private readonly IFixedValueParameter relativeGapToleranceParam;
+ private readonly IFixedValueParameter relativeGapToleranceParam;
[Storable]
@@ -65,6 +66,6 @@
public IConstrainedValueParameter SolverParameter {
- get { return solverParam; }
- set { solverParam = value; }
+ get => solverParam;
+ set => solverParam = value;
}
@@ -72,6 +73,17 @@
Parameters.Add(solverParam =
new ConstrainedValueParameter(nameof(Solver), "The solver used to solve the model."));
- Parameters.Add(relativeGapToleranceParam = new FixedValueParameter(nameof(RelativeGapTolerance),
- "Limit for relative MIP gap.", new DoubleValue(MPSolverParameters.kDefaultRelativeMipGap)));
+
+ ISolver defaultSolver;
+ solverParam.ValidValues.Add(new BopSolver());
+ solverParam.ValidValues.Add(defaultSolver = new CoinOrSolver());
+ solverParam.ValidValues.Add(new CplexSolver());
+ solverParam.ValidValues.Add(new GlopSolver());
+ solverParam.ValidValues.Add(new GlpkSolver());
+ solverParam.ValidValues.Add(new GurobiSolver());
+ solverParam.ValidValues.Add(new ScipSolver());
+ solverParam.Value = defaultSolver;
+
+ Parameters.Add(relativeGapToleranceParam = new FixedValueParameter(nameof(RelativeGapTolerance),
+ "Limit for relative MIP gap.", new PercentValue(MPSolverParameters.kDefaultRelativeMipGap)));
Parameters.Add(timeLimitParam = new FixedValueParameter(nameof(TimeLimit),
"Limit for runtime. Set to zero for unlimited runtime.", new TimeSpanValue()));
@@ -92,12 +104,4 @@
Problem = new LinearProgrammingProblem();
-
- solverParam.ValidValues.Add(new CoinOrSolver());
- solverParam.ValidValues.Add(new CplexSolver());
- solverParam.ValidValues.Add(new GlpkSolver());
- solverParam.ValidValues.Add(new GurobiSolver());
- solverParam.ValidValues.Add(new ScipSolver());
- solverParam.ValidValues.Add(new BopSolver());
- solverParam.ValidValues.Add(new GlopSolver());
}
@@ -176,5 +180,5 @@
public override void Pause() {
base.Pause();
- Solver.Interrupt();
+ Solver.InterruptSolve();
}
@@ -190,9 +194,5 @@
public override void Stop() {
base.Stop();
- Solver.Interrupt();
- }
-
- protected override void Initialize(CancellationToken cancellationToken) {
- base.Initialize(cancellationToken);
+ Solver.InterruptSolve();
}
Index: anches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingType.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/LinearProgrammingType.cs (revision 16372)
+++ (revision )
@@ -1,28 +1,0 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see .
- */
-#endregion
-
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms {
-
- public enum LinearProgrammingType {
- LinearProgramming,
- MixedIntegerProgramming
- }
-}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/ProblemType.cs (revision 16373)
@@ -0,0 +1,28 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms {
+
+ public enum ProblemType {
+ LinearProgramming,
+ MixedIntegerProgramming
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IIncrementalSolver.cs (revision 16373)
@@ -25,6 +25,6 @@
public interface IIncrementalSolver : ISolver {
- bool Incrementality { get; set; }
TimeSpan QualityUpdateInterval { get; set; }
+ bool SupportsQualityUpdate { get; }
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ISolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ISolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/ISolver.cs (revision 16373)
@@ -26,9 +26,9 @@
public interface ISolver : IParameterizedNamedItem {
- LinearProgrammingType LinearProgrammingType { get; set; }
+ ProblemType ProblemType { get; set; }
bool SupportsPause { get; }
bool SupportsStop { get; }
- void Interrupt();
+ bool InterruptSolve();
void Reset();
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalSolver.cs (revision 16373)
@@ -23,5 +23,4 @@
using System.Linq;
using System.Threading;
-using Google.OrTools.LinearSolver;
using HeuristicLab.Analysis;
using HeuristicLab.Common;
@@ -35,7 +34,4 @@
[StorableClass]
public class IncrementalSolver : Solver, IIncrementalSolver {
-
- [Storable]
- protected readonly IValueParameter incrementalityParam;
[Storable]
@@ -55,17 +51,15 @@
public IncrementalSolver() {
- Parameters.Add(incrementalityParam = new ValueParameter(nameof(Incrementality),
- "Advanced usage: incrementality from one solve to the next.",
- new BoolValue(MPSolverParameters.kDefaultIncrementality == MPSolverParameters.INCREMENTALITY_ON)));
Parameters.Add(qualityUpdateIntervalParam =
new ValueParameter(nameof(QualityUpdateInterval),
- "Time interval before solver is paused, resuls are retrieved and solver is resumed.",
- new TimeSpanValue(new TimeSpan(0, 0, 10))));
-
- incrementalityParam.Value.ValueChanged += (sender, args) => {
- if (((BoolValue)sender).Value) {
- qualityUpdateIntervalParam.Value = new TimeSpanValue(qualityUpdateIntervalParam.Value.Value);
+ "Time interval before solver is paused, results are retrieved and solver is resumed. " +
+ "Set to zero for no intermediate results and faster solving.", new TimeSpanValue(new TimeSpan(0, 0, 10))));
+ problemTypeParam.Value.ValueChanged += (sender, args) => {
+ if (SupportsQualityUpdate) {
+ if (!Parameters.Contains(qualityUpdateIntervalParam)) {
+ Parameters.Add(qualityUpdateIntervalParam);
+ }
} else {
- qualityUpdateIntervalParam.Value = (TimeSpanValue)qualityUpdateIntervalParam.Value.AsReadOnly();
+ Parameters.Remove(qualityUpdateIntervalParam);
}
};
@@ -74,15 +68,11 @@
protected IncrementalSolver(IncrementalSolver original, Cloner cloner)
: base(original, cloner) {
- programmingTypeParam = cloner.Clone(original.programmingTypeParam);
+ problemTypeParam = cloner.Clone(original.problemTypeParam);
qualityUpdateIntervalParam = cloner.Clone(original.qualityUpdateIntervalParam);
- incrementalityParam = cloner.Clone(original.incrementalityParam);
if (original.qualityPerClock != null)
qualityPerClock = cloner.Clone(original.qualityPerClock);
}
- public bool Incrementality {
- get => incrementalityParam.Value.Value;
- set => incrementalityParam.Value.Value = value;
- }
+ public virtual bool SupportsQualityUpdate => true;
public TimeSpan QualityUpdateInterval {
@@ -91,6 +81,8 @@
}
+ protected virtual TimeSpan TimeLimit => QualityUpdateInterval;
+
public override void Solve(LinearProgrammingAlgorithm algorithm, CancellationToken cancellationToken) {
- if (!Incrementality) {
+ if (!SupportsQualityUpdate || QualityUpdateInterval == TimeSpan.Zero) {
base.Solve(algorithm, cancellationToken);
return;
@@ -101,20 +93,20 @@
if (!unlimitedRuntime) {
- var wallTime = ((TimeSpanValue)algorithm.Results.SingleOrDefault(r => r.Name == "Wall Time")?.Value)?.Value;
- if (wallTime.HasValue) {
- timeLimit -= wallTime.Value;
- }
+ timeLimit -= algorithm.ExecutionTime;
}
var iterations = (long)timeLimit.TotalMilliseconds / (long)QualityUpdateInterval.TotalMilliseconds;
var remaining = timeLimit - TimeSpan.FromMilliseconds(iterations * QualityUpdateInterval.TotalMilliseconds);
- var validResultStatuses = new[] { ResultStatus.NOT_SOLVED, ResultStatus.FEASIBLE };
+ var validResultStatuses = new[] { ResultStatus.NotSolved, ResultStatus.Feasible };
while (unlimitedRuntime || iterations > 0) {
- base.Solve(algorithm, QualityUpdateInterval, true);
+ if (cancellationToken.IsCancellationRequested)
+ return;
+
+ base.Solve(algorithm, TimeLimit);
UpdateQuality(algorithm);
- var resultStatus = ((EnumValue)algorithm.Results["Result Status"].Value).Value;
- if (!validResultStatuses.Contains(resultStatus) || cancellationToken.IsCancellationRequested)
+ var resultStatus = ((EnumValue)algorithm.Results[nameof(solver.ResultStatus)].Value).Value;
+ if (!validResultStatuses.Contains(resultStatus))
return;
@@ -124,5 +116,5 @@
if (remaining > TimeSpan.Zero) {
- base.Solve(algorithm, remaining, true);
+ base.Solve(algorithm, remaining);
UpdateQuality(algorithm);
}
@@ -132,16 +124,16 @@
if (!algorithm.Results.Exists(r => r.Name == "QualityPerClock")) {
qualityPerClock = new IndexedDataTable("Quality per Clock");
- qpcRow = new IndexedDataRow("First-hit Graph Objective");
- bpcRow = new IndexedDataRow("First-hit Graph Bound");
+ qpcRow = new IndexedDataRow("Objective Value");
+ bpcRow = new IndexedDataRow("Bound");
algorithm.Results.AddOrUpdateResult("QualityPerClock", qualityPerClock);
}
- var resultStatus = ((EnumValue)algorithm.Results["Result Status"].Value).Value;
+ var resultStatus = ((EnumValue)algorithm.Results[nameof(solver.ResultStatus)].Value).Value;
- if (new[] { ResultStatus.ABNORMAL, ResultStatus.NOT_SOLVED, ResultStatus.UNBOUNDED }.Contains(resultStatus))
+ if (new[] { ResultStatus.Abnormal, ResultStatus.NotSolved, ResultStatus.Unbounded }.Contains(resultStatus))
return;
- var objective = ((DoubleValue)algorithm.Results["Best Objective Value"].Value).Value;
- var bound = ((DoubleValue)algorithm.Results["Best Objective Bound"].Value).Value;
+ var objective = ((DoubleValue)algorithm.Results[$"Best{nameof(solver.ObjectiveValue)}"].Value).Value;
+ var bound = solver.IsMip ? ((DoubleValue)algorithm.Results[$"Best{nameof(solver.ObjectiveBound)}"].Value).Value : double.NaN;
var time = algorithm.ExecutionTime.TotalSeconds;
@@ -151,5 +143,5 @@
qpcRow.Values.Add(Tuple.Create(time, objective));
qualityPerClock.Rows.Add(qpcRow);
- algorithm.Results.AddOrUpdateResult("Best Solution Found At", new TimeSpanValue(TimeSpan.FromSeconds(time)));
+ algorithm.Results.AddOrUpdateResult($"Best{nameof(solver.ObjectiveValue)}FoundAt", new TimeSpanValue(TimeSpan.FromSeconds(time)));
}
} else {
@@ -158,7 +150,10 @@
if (!objective.IsAlmost(previousBest)) {
qpcRow.Values.Add(Tuple.Create(time, objective));
- algorithm.Results.AddOrUpdateResult("Best Solution Found At", new TimeSpanValue(TimeSpan.FromSeconds(time)));
+ algorithm.Results.AddOrUpdateResult($"Best{nameof(solver.ObjectiveValue)}FoundAt", new TimeSpanValue(TimeSpan.FromSeconds(time)));
}
}
+
+ if (!solver.IsMip)
+ return;
if (!bpcRow.Values.Any()) {
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/Solver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/Solver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/Solver.cs (revision 16373)
@@ -34,12 +34,16 @@
[Storable]
- protected IValueParameter> programmingTypeParam;
+ protected IValueParameter> problemTypeParam;
protected LinearSolver solver;
+ [Storable]
+ protected IFixedValueParameter solverSpecificParametersParam;
+
public Solver() {
- Parameters.Add(programmingTypeParam =
- new ValueParameter>(nameof(LinearProgrammingType),
- new EnumValue()));
+ Parameters.Add(problemTypeParam =
+ new ValueParameter>(nameof(ProblemType), new EnumValue()));
+ Parameters.Add(solverSpecificParametersParam =
+ new FixedValueParameter(nameof(SolverSpecificParameters), new TextValue()));
}
@@ -51,15 +55,18 @@
protected Solver(Solver original, Cloner cloner)
: base(original, cloner) {
- programmingTypeParam = cloner.Clone(original.programmingTypeParam);
+ problemTypeParam = cloner.Clone(original.problemTypeParam);
+ solverSpecificParametersParam = cloner.Clone(original.solverSpecificParametersParam);
}
- public LinearProgrammingType LinearProgrammingType {
- get => programmingTypeParam.Value.Value;
- set => programmingTypeParam.Value.Value = value;
+ public ProblemType ProblemType {
+ get => problemTypeParam.Value.Value;
+ set => problemTypeParam.Value.Value = value;
}
+ public TextValue SolverSpecificParameters => solverSpecificParametersParam.Value;
+
+ public virtual bool SupportsPause => true;
+ public virtual bool SupportsStop => true;
protected virtual OptimizationProblemType OptimizationProblemType { get; }
- public virtual bool SupportsPause => false;
- public virtual bool SupportsStop => false;
public override IDeepCloneable Clone(Cloner cloner) => new Solver(this, cloner);
@@ -67,5 +74,5 @@
public void Dispose() => solver?.Dispose();
- public void Interrupt() => solver.Stop();
+ public bool InterruptSolve() => solver?.InterruptSolve() ?? false;
public virtual void Reset() {
@@ -78,7 +85,7 @@
public virtual void Solve(LinearProgrammingAlgorithm algorithm) =>
- Solve(algorithm, algorithm.TimeLimit, false);
+ Solve(algorithm, algorithm.TimeLimit);
- public virtual void Solve(LinearProgrammingAlgorithm algorithm, TimeSpan timeLimit, bool incrementality) {
+ public virtual void Solve(LinearProgrammingAlgorithm algorithm, TimeSpan timeLimit) {
string libraryName = null;
if (this is IExternalSolver externalSolver)
@@ -86,6 +93,6 @@
if (solver == null) {
- solver = LinearSolver.CreateSolver(OptimizationProblemType, Name,
- libraryName, s => algorithm.Problem.ProblemDefinition.BuildModel(s));
+ solver = new LinearSolver(OptimizationProblemType, s => algorithm.Problem.ProblemDefinition.BuildModel(s), Name,
+ libraryName);
}
@@ -97,22 +104,35 @@
solver.Scaling = algorithm.Scaling;
solver.LpAlgorithm = algorithm.LpAlgorithm;
- solver.Incrementality = incrementality;
+ solver.Incrementality = true;
+
+ if (!solver.SetSolverSpecificParameters(SolverSpecificParameters.Value))
+ throw new ArgumentException("Solver specific parameters could not be set.");
solver.Solve();
algorithm.Problem.ProblemDefinition.Analyze(solver.Solver, algorithm.Results);
- algorithm.Results.AddOrUpdateResult("Result Status", new EnumValue(solver.ResultStatus));
- algorithm.Results.AddOrUpdateResult("Best Objective Value",
+ algorithm.Results.AddOrUpdateResult(nameof(solver.ResultStatus),
+ new EnumValue(solver.ResultStatus));
+ algorithm.Results.AddOrUpdateResult($"Best{nameof(solver.ObjectiveValue)}",
new DoubleValue(solver.ObjectiveValue ?? double.NaN));
- algorithm.Results.AddOrUpdateResult("Best Objective Bound",
- new DoubleValue(solver.ObjectiveBound ?? double.NaN));
- algorithm.Results.AddOrUpdateResult("Absolute Gap", new DoubleValue(solver.AbsoluteGap ?? double.NaN));
- algorithm.Results.AddOrUpdateResult("Relative Gap", new DoubleValue(solver.RelativeGap ?? double.NaN));
- algorithm.Results.AddOrUpdateResult("Number of Constraints", new IntValue(solver.NumberOfConstraints));
- algorithm.Results.AddOrUpdateResult("Number of Variables", new IntValue(solver.NumberOfVariables));
- algorithm.Results.AddOrUpdateResult("Number of Nodes", new DoubleValue(solver.NumberOfNodes));
- algorithm.Results.AddOrUpdateResult("Iterations", new DoubleValue(solver.Iterations));
- algorithm.Results.AddOrUpdateResult("Solver Version", new StringValue(solver.SolverVersion));
- algorithm.Results.AddOrUpdateResult("Wall Time", new TimeSpanValue(solver.WallTime ?? TimeSpan.Zero));
+
+ if (solver.IsMip) {
+ algorithm.Results.AddOrUpdateResult($"Best{nameof(solver.ObjectiveBound)}",
+ new DoubleValue(solver.ObjectiveBound ?? double.NaN));
+ algorithm.Results.AddOrUpdateResult(nameof(solver.AbsoluteGap),
+ new DoubleValue(solver.AbsoluteGap ?? double.NaN));
+ algorithm.Results.AddOrUpdateResult(nameof(solver.RelativeGap),
+ new PercentValue(solver.RelativeGap ?? double.NaN));
+ }
+
+ algorithm.Results.AddOrUpdateResult(nameof(solver.NumberOfConstraints), new IntValue(solver.NumberOfConstraints));
+ algorithm.Results.AddOrUpdateResult(nameof(solver.NumberOfVariables), new IntValue(solver.NumberOfVariables));
+
+ if (solver.IsMip) {
+ algorithm.Results.AddOrUpdateResult(nameof(solver.NumberOfNodes), new DoubleValue(solver.NumberOfNodes));
+ }
+
+ algorithm.Results.AddOrUpdateResult(nameof(solver.Iterations), new DoubleValue(solver.Iterations));
+ algorithm.Results.AddOrUpdateResult(nameof(solver.SolverVersion), new StringValue(solver.SolverVersion));
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/BopSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/BopSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/BopSolver.cs (revision 16373)
@@ -20,7 +20,10 @@
#endregion
+using System;
using HeuristicLab.Common;
using HeuristicLab.Core;
+using HeuristicLab.Data;
using HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base;
+using HeuristicLab.Parameters;
using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32,5 +35,11 @@
public BopSolver() {
- Parameters.Remove(programmingTypeParam);
+ Parameters.Remove(problemTypeParam);
+ Parameters.Add(new FixedValueParameter(nameof(ProblemType), new StringValue("ZeroOneProgramming").AsReadOnly()));
+ SolverSpecificParameters.Value =
+ "# for file format, see Protocol Buffers text format (https://developers.google.com/protocol-buffers/docs/overview#whynotxml)" + Environment.NewLine +
+ "# for parameters, see https://github.com/google/or-tools/blob/v6.10/ortools/bop/bop_parameters.proto" + Environment.NewLine +
+ "# example:" + Environment.NewLine +
+ "# random_seed: 10" + Environment.NewLine;
}
@@ -44,10 +53,6 @@
}
- public override bool SupportsPause => true;
-
- public override bool SupportsStop => true;
-
protected override OptimizationProblemType OptimizationProblemType =>
- OptimizationProblemType.BOP_INTEGER_PROGRAMMING;
+ OptimizationProblemType.BopIntegerProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CoinOrSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CoinOrSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CoinOrSolver.cs (revision 16373)
@@ -22,5 +22,4 @@
using HeuristicLab.Common;
using HeuristicLab.Core;
-using HeuristicLab.Data;
using HeuristicLab.MathematicalOptimization.LinearProgramming.Algorithms.Solvers.Base;
using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33,18 +32,5 @@
public CoinOrSolver() {
- programmingTypeParam.Value.ValueChanged += (sender, args) => {
- if (((EnumValue)sender).Value == LinearProgrammingType.LinearProgramming) {
- incrementalityParam.Value = new BoolValue(true);
- incrementalityParam.Value.ValueChanged += (s, a) => {
- if (((BoolValue)s).Value) {
- qualityUpdateIntervalParam.Value = new TimeSpanValue(qualityUpdateIntervalParam.Value.Value);
- } else {
- qualityUpdateIntervalParam.Value = (TimeSpanValue)qualityUpdateIntervalParam.Value.AsReadOnly();
- }
- };
- } else {
- incrementalityParam.Value = (BoolValue)new BoolValue().AsReadOnly();
- }
- };
+ Parameters.Remove(solverSpecificParametersParam);
}
@@ -58,8 +44,14 @@
}
+ public override bool SupportsPause => false;
+
+ public override bool SupportsQualityUpdate => ProblemType == ProblemType.LinearProgramming;
+
+ public override bool SupportsStop => false;
+
protected override OptimizationProblemType OptimizationProblemType =>
- LinearProgrammingType == LinearProgrammingType.LinearProgramming
- ? OptimizationProblemType.CLP_LINEAR_PROGRAMMING
- : OptimizationProblemType.CBC_MIXED_INTEGER_PROGRAMMING;
+ ProblemType == ProblemType.LinearProgramming
+ ? OptimizationProblemType.ClpLinearProgramming
+ : OptimizationProblemType.CbcMixedIntegerProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CplexSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CplexSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/CplexSolver.cs (revision 16373)
@@ -20,4 +20,5 @@
#endregion
+using System;
using HeuristicLab.Common;
using HeuristicLab.Core;
@@ -36,4 +37,10 @@
Parameters.Add(libraryNameParam = new FixedValueParameter(nameof(LibraryName),
new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.CplexLibraryName }));
+ SolverSpecificParameters.Value =
+ "CPLEX Parameter File Version 12.8.0" + Environment.NewLine +
+ "# for file format, see https://www.ibm.com/support/knowledgecenter/SSSA5P_12.8.0/ilog.odms.cplex.help/CPLEX/FileFormats/topics/PRM.html" + Environment.NewLine +
+ "# for parameters, see https://www.ibm.com/support/knowledgecenter/SSSA5P_12.8.0/ilog.odms.cplex.help/CPLEX/Parameters/topics/introListTopical.html" + Environment.NewLine +
+ "# example:" + Environment.NewLine +
+ "# CPXPARAM_RandomSeed 10" + Environment.NewLine;
}
@@ -48,7 +55,7 @@
protected override OptimizationProblemType OptimizationProblemType =>
- LinearProgrammingType == LinearProgrammingType.LinearProgramming
- ? OptimizationProblemType.CPLEX_LINEAR_PROGRAMMING
- : OptimizationProblemType.CPLEX_MIXED_INTEGER_PROGRAMMING;
+ ProblemType == ProblemType.LinearProgramming
+ ? OptimizationProblemType.CplexLinearProgramming
+ : OptimizationProblemType.CplexMixedIntegerProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs (revision 16373)
@@ -20,4 +20,5 @@
#endregion
+using System;
using HeuristicLab.Common;
using HeuristicLab.Core;
@@ -33,5 +34,10 @@
public GlopSolver() {
- programmingTypeParam.Value = (EnumValue)programmingTypeParam.Value.AsReadOnly();
+ problemTypeParam.Value = (EnumValue)problemTypeParam.Value.AsReadOnly();
+ SolverSpecificParameters.Value =
+ "# for file format, see Protocol Buffers text format (https://developers.google.com/protocol-buffers/docs/overview#whynotxml)" + Environment.NewLine +
+ "# for parameters, see https://github.com/google/or-tools/blob/v6.10/ortools/glop/parameters.proto" + Environment.NewLine +
+ "# example:" + Environment.NewLine +
+ "# random_seed: 10" + Environment.NewLine;
}
@@ -45,10 +51,6 @@
}
- public override bool SupportsPause => true;
-
- public override bool SupportsStop => true;
-
protected override OptimizationProblemType OptimizationProblemType =>
- OptimizationProblemType.GLOP_LINEAR_PROGRAMMING;
+ OptimizationProblemType.GlopLinearProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlpkSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlpkSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlpkSolver.cs (revision 16373)
@@ -34,21 +34,7 @@
public GlpkSolver() {
+ Parameters.Remove(solverSpecificParametersParam);
Parameters.Add(libraryNameParam = new FixedValueParameter(nameof(LibraryName),
new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.GlpkLibraryName }));
-
- programmingTypeParam.Value.ValueChanged += (sender, args) => {
- if (((EnumValue)sender).Value == LinearProgrammingType.LinearProgramming) {
- incrementalityParam.Value = new BoolValue(true);
- incrementalityParam.Value.ValueChanged += (s, a) => {
- if (((BoolValue)s).Value) {
- qualityUpdateIntervalParam.Value = new TimeSpanValue(qualityUpdateIntervalParam.Value.Value);
- } else {
- qualityUpdateIntervalParam.Value = (TimeSpanValue)qualityUpdateIntervalParam.Value.AsReadOnly();
- }
- };
- } else {
- incrementalityParam.Value = (BoolValue)new BoolValue().AsReadOnly();
- }
- };
}
@@ -62,8 +48,12 @@
}
+ public override bool SupportsPause => ProblemType == ProblemType.LinearProgramming; // TODO: pause working for linear programs?
+
+ public override bool SupportsQualityUpdate => ProblemType == ProblemType.LinearProgramming;
+
protected override OptimizationProblemType OptimizationProblemType =>
- LinearProgrammingType == LinearProgrammingType.LinearProgramming
- ? OptimizationProblemType.GLPK_LINEAR_PROGRAMMING
- : OptimizationProblemType.GLPK_MIXED_INTEGER_PROGRAMMING;
+ ProblemType == ProblemType.LinearProgramming
+ ? OptimizationProblemType.GlpkLinearProgramming
+ : OptimizationProblemType.GlpkMixedIntegerProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/GurobiSolver.cs (revision 16373)
@@ -20,4 +20,5 @@
#endregion
+using System;
using HeuristicLab.Common;
using HeuristicLab.Core;
@@ -36,9 +37,14 @@
Parameters.Add(libraryNameParam = new FixedValueParameter(nameof(LibraryName),
new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.GurobiLibraryName }));
+ SolverSpecificParameters.Value =
+ "# for file format, see http://www.gurobi.com/documentation/8.1/refman/prm_format.html" + Environment.NewLine +
+ "# for parameters, see http://www.gurobi.com/documentation/8.1/refman/parameters.html" + Environment.NewLine +
+ "# example:" + Environment.NewLine +
+ "# Seed 10" + Environment.NewLine;
}
protected GurobiSolver(GurobiSolver original, Cloner cloner)
: base(original, cloner) {
- programmingTypeParam = cloner.Clone(original.programmingTypeParam);
+ problemTypeParam = cloner.Clone(original.problemTypeParam);
}
@@ -48,12 +54,8 @@
}
- public override bool SupportsPause => true;
-
- public override bool SupportsStop => true;
-
protected override OptimizationProblemType OptimizationProblemType =>
- LinearProgrammingType == LinearProgrammingType.LinearProgramming
- ? OptimizationProblemType.GUROBI_LINEAR_PROGRAMMING
- : OptimizationProblemType.GUROBI_MIXED_INTEGER_PROGRAMMING;
+ ProblemType == ProblemType.LinearProgramming
+ ? OptimizationProblemType.GurobiLinearProgramming
+ : OptimizationProblemType.GurobiMixedIntegerProgramming;
}
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/ScipSolver.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/ScipSolver.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Algorithms/Solvers/ScipSolver.cs (revision 16373)
@@ -20,4 +20,6 @@
#endregion
+using System;
+using System.Threading;
using HeuristicLab.Common;
using HeuristicLab.Core;
@@ -31,12 +33,17 @@
[Item("SCIP", "SCIP (http://scip.zib.de/) must be installed and licenced.")]
[StorableClass]
- public class ScipSolver : ExternalSolver {
+ public class ScipSolver : ExternalIncrementalSolver {
+
+ private TimeSpan timeLimit = TimeSpan.Zero;
public ScipSolver() {
Parameters.Add(libraryNameParam = new FixedValueParameter(nameof(LibraryName),
new FileValue { FileDialogFilter = FileDialogFilter, Value = Properties.Settings.Default.ScipLibraryName }));
- programmingTypeParam.Value =
- (EnumValue)new EnumValue(LinearProgrammingType
- .MixedIntegerProgramming).AsReadOnly();
+ problemTypeParam.Value =
+ (EnumValue)new EnumValue(ProblemType.MixedIntegerProgramming).AsReadOnly();
+ SolverSpecificParameters.Value =
+ "# for file format and parameters, see https://scip.zib.de/doc/html/PARAMETERS.php" + Environment.NewLine +
+ "# example:" + Environment.NewLine +
+ "# branching/random/seed = 10" + Environment.NewLine;
}
@@ -50,10 +57,12 @@
}
- public override bool SupportsPause => true;
+ protected override OptimizationProblemType OptimizationProblemType =>
+ OptimizationProblemType.ScipMixedIntegerProgramming;
+ protected override TimeSpan TimeLimit => timeLimit += QualityUpdateInterval;
- public override bool SupportsStop => true;
-
- protected override OptimizationProblemType OptimizationProblemType =>
- OptimizationProblemType.SCIP_MIXED_INTEGER_PROGRAMMING;
+ public override void Solve(LinearProgrammingAlgorithm algorithm, CancellationToken cancellationToken) {
+ timeLimit = TimeSpan.Zero;
+ base.Solve(algorithm, cancellationToken);
+ }
}
}
Index: anches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/DoubleParam.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/DoubleParam.cs (revision 16372)
+++ (revision )
@@ -1,39 +1,0 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see .
- */
-#endregion
-
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
-
- // Enumeration of parameters that take continuous values.
- public enum DoubleParam {
-
- // Limit for relative MIP gap.
- RELATIVE_MIP_GAP = 0,
-
- // Advanced usage: tolerance for primal feasibility of basic
- // solutions. This does not control the integer feasibility
- // tolerance of integer solutions for MIP or the tolerance used
- // during presolve.
- PRIMAL_TOLERANCE = 1,
-
- // Advanced usage: tolerance for dual feasibility of basic solutions.
- DUAL_TOLERANCE = 2
- };
-}
Index: anches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/IncrementalityValues.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/IncrementalityValues.cs (revision 16372)
+++ (revision )
@@ -1,33 +1,0 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see .
- */
-#endregion
-
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
-
- public enum IncrementalityValues {
-
- // Start solve from scratch.
- INCREMENTALITY_OFF = 0,
-
- // Reuse results from previous solve as much as the underlying
- // solver allows.
- INCREMENTALITY_ON = 1
- };
-}
Index: anches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/IntegerParam.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/IntegerParam.cs (revision 16372)
+++ (revision )
@@ -1,39 +1,0 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see .
- */
-#endregion
-
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
-
- // Enumeration of parameters that take integer or categorical values.
- public enum IntegerParam {
-
- // Advanced usage: presolve mode.
- PRESOLVE = 1000,
-
- // Algorithm to solve linear programs.
- LP_ALGORITHM = 1001,
-
- // Advanced usage: incrementality from one solve to the next.
- INCREMENTALITY = 1002,
-
- // Advanced usage: enable or disable matrix scaling.
- SCALING = 1003
- };
-}
Index: anches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/LpAlgorithmValues.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/LpAlgorithmValues.cs (revision 16372)
+++ (revision )
@@ -1,29 +1,0 @@
-#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see .
- */
-#endregion
-
-namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
-
- public enum LpAlgorithmValues {
- DualSimplex = 10,
- PrimalSimplex = 11,
- BarrierAlgorithm = 12
- };
-}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/ILinearProgrammingProblemDefinition.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/ILinearProgrammingProblemDefinition.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/ILinearProgrammingProblemDefinition.cs (revision 16373)
@@ -27,5 +27,5 @@
public interface ILinearProgrammingProblemDefinition {
- void BuildModel(Solver solver);
+ bool BuildModel(Solver solver);
void Analyze(Solver solver, ResultCollection results);
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblem.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblem.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblem.cs (revision 16373)
@@ -21,5 +21,4 @@
using System.Drawing;
-using Google.OrTools.LinearSolver;
using HeuristicLab.Common;
using HeuristicLab.Common.Resources;
@@ -31,5 +30,5 @@
namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Problems {
- [Item("Linear/Mixed Integer Programming Problem (LP/MIP)", "")]
+ [Item("Linear/Mixed Integer Programming Problem (LP/MIP)", "Represents a linear/mixed integer problem.")]
[Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
[StorableClass]
@@ -56,6 +55,4 @@
private FixedValueParameter LinearProgrammingProblemScriptParameter =>
(FixedValueParameter)Parameters["ProblemScript"];
-
- public void BuildModel(Solver solver) => ProblemDefinition.BuildModel(solver);
public override IDeepCloneable Clone(Cloner cloner) {
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Problems/LinearProgrammingProblemDefinitionScript.cs (revision 16373)
@@ -33,5 +33,5 @@
namespace HeuristicLab.MathematicalOptimization.LinearProgramming.Problems {
- [Item("Single-objective Problem Definition Script", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
+ [Item("Linear/Mixed Integer Programming Problem Definition Script", "Script that defines the model and evaluates the solution for a linear/mixed integer programming problem.")]
[StorableClass]
public sealed class LinearProgrammingProblemDefinitionScript : Script, ILinearProgrammingProblemDefinition, IStorableContent {
@@ -144,5 +144,5 @@
}
- public void BuildModel(Solver solver) => CompiledProblemDefinition.BuildModel(solver);
+ public bool BuildModel(Solver solver) => CompiledProblemDefinition.BuildModel(solver);
public void Analyze(Solver solver, ResultCollection results) => CompiledProblemDefinition.Analyze(solver, results);
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/CompiledLinearProgrammingProblemDefinition.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/CompiledLinearProgrammingProblemDefinition.cs (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Templates/CompiledLinearProgrammingProblemDefinition.cs (revision 16373)
@@ -16,11 +16,11 @@
private Variable x;
private Variable y;
-
+
public override void Initialize() {
// Use vars.yourVariable to access variables in the variable store i.e. yourVariable
// Add additional initialization code e.g. private variables that you need for evaluating
}
-
- public void BuildModel(Solver solver) {
+
+ public bool BuildModel(Solver solver) {
// Use vars.yourVariable to access variables in the variable store i.e. yourVariable
// Example model taken from https://developers.google.com/optimization/mip/integer_opt
@@ -32,6 +32,7 @@
// Define the objective
solver.Maximize(x + 10 * y);
+ return true;
}
-
+
public void Analyze(Solver solver, ResultCollection results) {
// Use vars.yourVariable to access variables in the variable store i.e. yourVariable
@@ -43,5 +44,5 @@
//results.AddOrUpdateResult("y", new DoubleValue(solver.LookupVariableOrNull("y").SolutionValue()));
}
-
+
// Implement further classes and methods
}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/DoubleParam.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/DoubleParam.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/DoubleParam.cs (revision 16373)
@@ -0,0 +1,39 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ // Enumeration of parameters that take continuous values.
+ public enum DoubleParam {
+
+ // Limit for relative MIP gap.
+ RelativeMipGap = 0,
+
+ // Advanced usage: tolerance for primal feasibility of basic
+ // solutions. This does not control the integer feasibility
+ // tolerance of integer solutions for MIP or the tolerance used
+ // during presolve.
+ PrimalTolerance = 1,
+
+ // Advanced usage: tolerance for dual feasibility of basic solutions.
+ DualTolerance = 2
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IncrementalityValues.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IncrementalityValues.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IncrementalityValues.cs (revision 16373)
@@ -0,0 +1,33 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ public enum IncrementalityValues {
+
+ // Start solve from scratch.
+ IncrementalityOff = 0,
+
+ // Reuse results from previous solve as much as the underlying
+ // solver allows.
+ IncrementalityOn = 1
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IntegerParam.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IntegerParam.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/IntegerParam.cs (revision 16373)
@@ -0,0 +1,39 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ // Enumeration of parameters that take integer or categorical values.
+ public enum IntegerParam {
+
+ // Advanced usage: presolve mode.
+ Presolve = 1000,
+
+ // Algorithm to solve linear programs.
+ LpAlgorithm = 1001,
+
+ // Advanced usage: incrementality from one solve to the next.
+ Incrementality = 1002,
+
+ // Advanced usage: enable or disable matrix scaling.
+ Scaling = 1003
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/LpAlgorithmValues.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/LpAlgorithmValues.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/LpAlgorithmValues.cs (revision 16373)
@@ -0,0 +1,29 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ public enum LpAlgorithmValues {
+ DualSimplex = 10,
+ PrimalSimplex = 11,
+ BarrierAlgorithm = 12
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/ProtoWriteFormat.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/ProtoWriteFormat.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/ProtoWriteFormat.cs (revision 16373)
@@ -0,0 +1,29 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ public enum ProtoWriteFormat {
+ ProtoText,
+ ProtoBinary,
+ Json
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/SolverResponseStatus.cs
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/SolverResponseStatus.cs (revision 16373)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/LinearProgramming/Wrapper/SolverResponseStatus.cs (revision 16373)
@@ -0,0 +1,38 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.MathematicalOptimization.LinearProgramming {
+
+ public enum SolverResponseStatus {
+ Optimal = 0,
+ Feasible = 1,
+ Infeasible = 2,
+ Unbounded = 3,
+ Abnormal = 4,
+ ModelInvalid = 5,
+ NotSolved = 6,
+ SolverTypeUnavailable = 7,
+ ModelInvalidSolutionHint = 84,
+ ModelInvalidSolverParameters = 85,
+ ModelIsValid = 97,
+ UnknownStatus = 99
+ }
+}
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/Plugin.cs.frame
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/Plugin.cs.frame (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/Plugin.cs.frame (revision 16373)
@@ -24,5 +24,6 @@
namespace HeuristicLab.MathematicalOptimization {
- [Plugin("HeuristicLab.MathematicalOptimization", "Provides support for mathematical optimization based on Google OR-Tools", "3.3.15.$WCREV$")]
+ [Plugin("HeuristicLab.MathematicalOptimization", "Provides support for mathematical optimization based on Google OR-Tools. " +
+ "Requires the Microsoft Visual C++ 2017 Redistributable (x64) - 14.16.27012: https://aka.ms/vs/15/release/vc_redist.x64.exe", "3.3.15.$WCREV$")]
[PluginFile("HeuristicLab.MathematicalOptimization-3.3.dll", PluginFileType.Assembly)]
[PluginDependency("HeuristicLab.Analysis", "3.3")]
@@ -37,5 +38,5 @@
[PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
[PluginDependency("HeuristicLab.Optimization", "3.3")]
- [PluginDependency("HeuristicLab.OrTools", "6.9")]
+ [PluginDependency("HeuristicLab.OrTools", "6.10")]
[PluginDependency("HeuristicLab.Parameters", "3.3")]
[PluginDependency("HeuristicLab.Persistence", "3.3")]
Index: /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/app.config
===================================================================
--- /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/app.config (revision 16372)
+++ /branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/app.config (revision 16373)
@@ -12,5 +12,5 @@
- gurobi80.dll
+ gurobi81.dll
Index: /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj
===================================================================
--- /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj (revision 16372)
+++ /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views-3.3.csproj (revision 16373)
@@ -18,5 +18,5 @@
full
false
- ..\..\..\..\trunk\sources\bin\
+ ..\..\..\..\trunk\bin\
DEBUG;TRACE
prompt
@@ -41,80 +41,80 @@
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Data.Views-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Optimization.Views-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Optimizer-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters.Views-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Parameters.Views-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Problems.Instances-3.3.dll
False
Index: /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj
===================================================================
--- /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj (revision 16372)
+++ /branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj (revision 16373)
@@ -18,5 +18,5 @@
full
false
- ..\..\..\..\trunk\sources\bin\
+ ..\..\..\..\trunk\bin\
DEBUG;TRACE
prompt
@@ -41,85 +41,85 @@
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Problems.Instances-3.3.dll
False
False
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll
+ ..\..\..\..\trunk\bin\HeuristicLab.Random-3.3.dll
False