Merge branch 'release/2.1.1'

MiniZinc · Dec 14, 2016 · d85800d · d85800d
2 parents f93349f + 6fe9500
commit d85800d
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/MiniZincIDE/CHANGES b/MiniZincIDE/CHANGES
@@ -1,3 +1,7 @@
+2016-12-14
+  v2.1.1
+  - Add option to print mzn2fzn statistics to project configuration.
+  - Update to MiniZinc 2.1.1.
 2016-11-16
   v2.1.0
   - Add new bundled solvers: Chuffed, CBC, Gurobi

diff --git a/MiniZincIDE/MiniZincIDE.pro b/MiniZincIDE/MiniZincIDE.pro
@@ -19,7 +19,7 @@ greaterThan(QT_MAJOR_VERSION, 4): {
 TARGET = MiniZincIDE
 TEMPLATE = app
 
-VERSION = 2.1.0
+VERSION = 2.1.1
 DEFINES += MINIZINC_IDE_VERSION=\\\"$$VERSION\\\"
 
 bundled {

diff --git a/MiniZincIDE/mainwindow.cpp b/MiniZincIDE/mainwindow.cpp
@@ -1361,6 +1361,8 @@ QStringList MainWindow::parseConf(bool compileOnly, bool useDataFile)
         ret << "--no-optimize";
     if (compileOnly && project.mzn2fznVerbose())
         ret << "-v";
+    if (compileOnly && project.mzn2fznPrintStats())
+        ret << "-s";
     if (compileOnly && project.haveExtraArgs() &&
         !project.extraArgs().isEmpty())
         ret << "-D" << project.extraArgs();
@@ -2632,6 +2634,7 @@ void MainWindow::saveProject(const QString& f)
             }
             out << projectFilesRelPath;
             out << project.defaultBehaviour();
+            out << project.mzn2fznPrintStats();
             project.setModified(false, true);
 
         } else {
@@ -2738,6 +2741,10 @@ void MainWindow::loadProject(const QString& filepath)
     } else {
         project.defaultBehaviour(project.n_solutions() == 1 && !project.printAll());
     }
+    if (version==104 && !in.atEnd()) {
+        in >> p_b;
+        project.mzn2fznPrintStats(p_b, true);
+    }
     for (int i=0; i<projectFilesRelPath.size(); i++) {
         QFileInfo fi(basePath+projectFilesRelPath[i]);
         if (fi.exists()) {

diff --git a/MiniZincIDE/mainwindow.ui b/MiniZincIDE/mainwindow.ui
@@ -89,9 +89,9 @@
            <property name="geometry">
             <rect>
              <x>0</x>
-             <y>-181</y>
-             <width>593</width>
-             <height>797</height>
+             <y>-225</y>
+             <width>595</width>
+             <height>818</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -405,6 +405,13 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QCheckBox" name="conf_flatten_stats">
+                 <property name="text">
+                  <string>Statistics for flattening</string>
+                 </property>
+                </widget>
+               </item>
                <item>
                 <widget class="QCheckBox" name="conf_optimize">
                  <property name="text">
@@ -554,6 +561,7 @@
               <zorder>conf_verbose</zorder>
               <zorder>conf_optimize</zorder>
               <zorder>autoclear_output</zorder>
+              <zorder>conf_flatten_stats</zorder>
              </widget>
             </item>
            </layout>

diff --git a/MiniZincIDE/project.cpp b/MiniZincIDE/project.cpp
@@ -303,6 +303,7 @@ void Project::setModified(bool flag, bool files)
                 haveExtraArgs(haveExtraArgs(),true);
                 extraArgs(extraArgs(),true);
                 mzn2fznVerbose(mzn2fznVerbose(),true);
+                mzn2fznPrintStats(mzn2fznPrintStats(),true);
                 mzn2fznOptimize(mzn2fznOptimize(),true);
                 currentSolver(currentSolver(),true);
                 n_solutions(n_solutions(),true);
@@ -363,6 +364,11 @@ bool Project::mzn2fznVerbose(void) const
 {
     return ui->conf_verbose->isChecked();
 }
+
+bool Project::mzn2fznPrintStats() const
+{
+    return ui->conf_flatten_stats->isChecked();
+}
 bool Project::mzn2fznOptimize(void) const
 {
     return ui->conf_optimize->isChecked();
@@ -492,6 +498,16 @@ void Project::mzn2fznVerbose(bool b, bool init)
     }
 }
 
+void Project::mzn2fznPrintStats(bool b, bool init)
+{
+    if (init) {
+        _mzn2fzn_printStats = b;
+        ui->conf_flatten_stats->setChecked(b);
+    } else {
+        checkModified();
+    }
+}
+
 void Project::mzn2fznOptimize(bool b, bool init)
 {
     if (init) {
@@ -652,6 +668,10 @@ void Project::checkModified()
         setModified(true);
         return;
     }
+    if (mzn2fznPrintStats() != _mzn2fzn_printStats) {
+        setModified(true);
+        return;
+    }
     if (mzn2fznOptimize() != _mzn2fzn_optimize) {
         setModified(true);
         return;

diff --git a/MiniZincIDE/project.h b/MiniZincIDE/project.h
@@ -71,6 +71,7 @@ class Project : public QStandardItemModel
     QString extraMzn2FznArgs(void) const;
     bool autoClearOutput(void) const;
     bool mzn2fznVerbose(void) const;
+    bool mzn2fznPrintStats(void) const;
     bool mzn2fznOptimize(void) const;
     QString currentSolver(void) const;
     int n_solutions(void) const;
@@ -94,6 +95,7 @@ public slots:
     void extraMzn2FznArgs(const QString& a, bool init=false);
     void autoClearOutput(bool b, bool init=false);
     void mzn2fznVerbose(bool b, bool init=false);
+    void mzn2fznPrintStats(bool b, bool init=false);
     void mzn2fznOptimize(bool b, bool init=false);
     void currentSolver(const QString& s, bool init=false);
     void n_solutions(int n, bool init=false);
@@ -128,6 +130,7 @@ public slots:
     QString _extraMzn2FznArgs;
     bool _autoclear_output;
     bool _mzn2fzn_verbose;
+    bool _mzn2fzn_printStats;
     bool _mzn2fzn_optimize;
     QString _currentSolver;
     int _n_solutions;