WIP for standalone solver exe

example/example_unsolvable.txt

@@ -0,0 +1,73 @@
+
+Creating VersionProblem inst# 0 with 18 packages, 1 stats, 1 debug
+DepSelector inst# 0 - Adding package id 0/18: min = -1, max = 9, current version 0
+DepSelector inst# 0 - Adding package id 1/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding package id 2/18: min = -1, max = 1, current version 0
+DepSelector inst# 0 - Adding package id 3/18: min = -1, max = 6, current version 0
+DepSelector inst# 0 - Adding package id 4/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding VC for 3 @ 0 depPkg 4 [ 0, 0 ]
+DepSelector inst# 0 - Adding package id 5/18: min = -1, max = 1, current version 0
+DepSelector inst# 0 - Adding package id 6/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding package id 7/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding package id 8/18: min = -1, max = 3, current version 0
+DepSelector inst# 0 - Adding package id 9/18: min = -1, max = 1, current version 0
+DepSelector inst# 0 - Adding package id 10/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding VC for 9 @ 1 depPkg 10 [ 0, 0 ]
+DepSelector inst# 0 - Adding VC for 9 @ 1 depPkg 1 [ 0, 0 ]
+DepSelector inst# 0 - Adding package id 11/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding VC for 9 @ 1 depPkg 11 [ 0, 0 ]
+DepSelector inst# 0 - Adding package id 12/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding VC for 9 @ 1 depPkg 12 [ 0, 0 ]
+DepSelector inst# 0 - Adding VC for 9 @ 0 depPkg 10 [ 0, 0 ]
+DepSelector inst# 0 - Adding VC for 9 @ 0 depPkg 1 [ 0, 0 ]
+DepSelector inst# 0 - Adding VC for 9 @ 0 depPkg 11 [ 0, 0 ]
+DepSelector inst# 0 - Adding VC for 9 @ 0 depPkg 12 [ 0, 0 ]
+DepSelector inst# 0 - Adding package id 13/18: min = -1, max = -1, current version 0
+DepSelector inst# 0 - Adding VC for 9 @ 0 depPkg 13 [ -2, -2 ]
+DepSelector inst# 0 - Marking Package Suspicious 13
+DepSelector inst# 0 - Adding package id 14/18: min = -1, max = 0, current version 0
+DepSelector inst# 0 - Adding package id 15/18: min = -1, max = 16, current version 0
+DepSelector inst# 0 - Adding package id 16/18: min = -1, max = 8, current version 0
+DepSelector inst# 0 - Adding package id 17/18: min = 0, max = 0, current version 0
+DepSelector inst# 0 - Marking Package Preferred Latest 0 weight 10
+DepSelector inst# 0 - Marking Package Required 0
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 0 [ 0, 9 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 0 weight 10
+DepSelector inst# 0 - Marking Package Required 0
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 0 [ 0, 9 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 1 weight 10
+DepSelector inst# 0 - Marking Package Required 1
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 1 [ 0, 0 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 2 weight 10
+DepSelector inst# 0 - Marking Package Required 2
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 2 [ 0, 1 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 3 weight 10
+DepSelector inst# 0 - Marking Package Required 3
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 3 [ 0, 6 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 5 weight 10
+DepSelector inst# 0 - Marking Package Required 5
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 5 [ 0, 1 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 6 weight 10
+DepSelector inst# 0 - Marking Package Required 6
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 6 [ 0, 0 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 7 weight 10
+DepSelector inst# 0 - Marking Package Required 7
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 7 [ 0, 0 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 8 weight 10
+DepSelector inst# 0 - Marking Package Required 8
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 8 [ 0, 3 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 9 weight 10
+DepSelector inst# 0 - Marking Package Required 9
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 9 [ 0, 1 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 9 weight 10
+DepSelector inst# 0 - Marking Package Required 9
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 9 [ 0, 1 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 14 weight 10
+DepSelector inst# 0 - Marking Package Required 14
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 14 [ 0, 0 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 15 weight 10
+DepSelector inst# 0 - Marking Package Required 15
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 15 [ 0, 16 ]
+DepSelector inst# 0 - Marking Package Preferred Latest 16 weight 10
+DepSelector inst# 0 - Marking Package Required 16
+DepSelector inst# 0 - Adding VC for 17 @ 0 depPkg 16 [ 99, 99 ]

gecodeinterface/.gitignore

@@ -0,0 +1 @@
+solver

gecodeinterface/README

@@ -0,0 +1,18 @@
+This will likely be getting split out into its own project, as currently
+it only shares dependencies on the contents of the 'examples' directory.
+
+This project creates a standalone executeable 'solver' that interfaces with
+gecode and provides a simple REPL interface.
+
+To build, ensure you have the gecode dev libs installed, then run
+
+./quickbuild
+
+(Makefile coming when we split this out...)
+
+The file 'reader.rb' parses the contents of examples in ../examples
+and formats them in a way that "solver" can recognize.
+
+Sample usage:
+./reader.rb ../examples/example_1.txt | ./solver
+

gecodeinterface/dep_selector_from_stream.cpp

@@ -0,0 +1,130 @@
+//
+// Author:: Mark Anderson (<mark@opscode.com>)
+// Author:: Mark Paradise (<marc@opscode.com>)
+// Copyright:: Copyright (c) 2013-2013 Opscode, Inc.
+// License:: Apache License, Version 2.0
+//
+// 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.
+//
+
+#include "dep_selector_to_gecode.h"
+#include "dep_selector_from_stream.h"
+
+#include <cstdio>
+#include <limits>
+#include <iostream>
+#include <vector>
+
+using namespace std;
+
+
+const int BUFSIZE = 1024;
+
+void dump_solution(VersionProblem *);
+bool check_state(std::istream & f);
+
+VersionProblem * dep_selector_from_stream(std::istream & f) {
+    string cmd;
+    string guid;
+    int dumpStats, debug;
+    int packageCount, packageId;
+
+    f >> guid >> packageCount >> dumpStats >> debug;
+    cout << "OK" << endl << flush;
+
+    VersionProblem *problem = new VersionProblem(packageCount, dumpStats, debug, guid.c_str());
+    bool replied = false;
+    while (true) {
+      // TODO definitely need some better error handling throughout...
+      if (!check_state(f)) {
+        cout << "ERROR" << endl << "input failure" << endl;
+        cout.flush();
+        return problem;
+      }
+      f >> cmd;
+      if (cmd.compare("P") == 0) {
+        int minVersion, maxVersion, currentVersion;
+        f >> minVersion >> maxVersion >> currentVersion;
+        int id = problem->AddPackage(minVersion, maxVersion, currentVersion);
+        if (id == -1) {
+          cout << "ERROR" << endl << "already added max packages" << endl;
+          return problem;
+        }
+        cout << "PID" << endl << id << endl;
+        replied = true;
+      } else if (cmd.compare("C") == 0) {
+        // TODO here down, make sure we have 'problem'...
+        int version, dependentPackageId, minDependentVersion, maxDependentVersion;
+        f >> packageId >> version >> dependentPackageId
+          >> minDependentVersion >> maxDependentVersion;
+        problem->AddVersionConstraint(packageId, version, dependentPackageId,
+                                      minDependentVersion, maxDependentVersion);
+      } else if (cmd.compare("S") == 0) {
+        f >> packageId;
+        problem->MarkPackageSuspicious(packageId);
+      } else if (cmd.compare("R") == 0) {
+        f >> packageId;
+        problem->MarkPackageRequired(packageId);
+      } else if (cmd.compare("L") == 0) {
+        int weight;
+        f >> packageId >> weight;
+        problem->MarkPackagePreferredToBeAtLatest(packageId, weight);
+      } else if (cmd.compare("X") == 0) {
+        if (problem->Size() == problem->PackageCount()) {
+          VersionProblem * solution = VersionProblem::Solve(problem);
+          if (solution) {
+            dump_solution(solution);
+          } else {
+            cout << "NOSOL" << endl;
+          }
+          return problem;
+        } else {
+          cout << "ERROR" << endl << "package count did not match expected." << endl;
+          return problem;
+        }
+      } else {
+         cout << "ERROR" << endl << "unexpected input: " << cmd << endl;
+         return problem;
+      }
+      if (!check_state(f)) {
+        return problem;
+      }
+      if (replied) {
+        replied = false;
+      } else {
+        cout << "OK" << endl;
+      }
+      cout.flush();
+    }
+    return problem;
+}
+
+bool check_state(std::istream & f) {
+  if (f.rdstate() & std::istream::failbit > 0) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+void dump_solution(VersionProblem * solution) {
+  int count = solution->PackageCount();
+  cout << "SOL" << endl << solution->GetDisabledVariableCount() << endl;
+  for (int id = 0; id < count; id++) {
+    // not dumping ids from now - these are sequential so id can be reliably inferred by caller
+    // TODO alternatively,  if we can confirm we don't care about disabled pcakages
+    // we can just do id + version, and skip disabled packages.
+    cout << solution->GetPackageDisabledState(id) << " " << solution->GetPackageVersion(id) << endl;
+  }
+  cout << "X"<< endl;
+}

gecodeinterface/dep_selector_from_stream.h

@@ -0,0 +1,29 @@
+//
+// Author:: Marc Paradise (<marc@opscode.com>)
+// Copyright:: Copyright (c) 2013-2013 Opscode, Inc.
+// License:: Apache License, Version 2.0
+//
+// 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.
+//
+//
+
+#ifndef dep_selector_to_stream_h
+#define dep_selector_to_stream_h
+
+#include <istream>
+#include "dep_selector_to_gecode_interface.h"
+
+VersionProblem * dep_selector_from_stream(std::istream& f);
+
+#endif
+