dep_selector 0.0.3 → 0.0.4

data/ext/dep_gecode/dep_selector_swig.i

@@ -27,7 +27,7 @@
 
 class VersionProblem;
 
-VersionProblem * VersionProblemCreate(int packageCount);
+VersionProblem * VersionProblemCreate(int packageCount, bool dumpStats);
 void VersionProblemDestroy(VersionProblem * vp);
 
 int VersionProblemSize(VersionProblem *p); 

data/ext/dep_gecode/dep_selector_swig_wrap.cxx

@@ -1633,6 +1633,26 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
+SWIGINTERN int
+SWIG_AsVal_bool (VALUE obj, bool *val)
+{
+  if (obj == Qtrue) {
+    if (val) *val = true;
+    return SWIG_OK;
+  } else if (obj == Qfalse) {
+    if (val) *val = false;
+    return SWIG_OK;
+  } else {
+    int res = 0;
+    if (SWIG_AsVal_int (obj, &res) == SWIG_OK) {    
+      if (val) *val = res ? true : false;
+      return SWIG_OK;
+    }
+  }  
+  return SWIG_TypeError;
+}
+
+
   #define SWIG_From_long   LONG2NUM 
 
 
@@ -1652,20 +1672,28 @@ SWIG_From_bool  (bool value)
 SWIGINTERN VALUE
 _wrap_VersionProblemCreate(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
+  bool arg2 ;
   VersionProblem *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   ecode1 = SWIG_AsVal_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "VersionProblemCreate" "', argument " "1"" of type '" "int""'");
   } 
   arg1 = static_cast< int >(val1);
-  result = (VersionProblem *)VersionProblemCreate(arg1);
+  ecode2 = SWIG_AsVal_bool(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "VersionProblemCreate" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  result = (VersionProblem *)VersionProblemCreate(arg1,arg2);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VersionProblem, 0 |  0 );
   return vresult;
 fail:

data/ext/dep_gecode/dep_selector_to_gecode.cpp

@@ -39,8 +39,9 @@ const int VersionProblem::MIN_TRUST_LEVEL = 0;
 const int VersionProblem::MAX_TRUST_LEVEL = 10;
 const int VersionProblem::MAX_PREFERRED_WEIGHT = 10;
 
-VersionProblem::VersionProblem(int packageCount)
-  : size(packageCount), finalized(false), cur_package(0), package_versions(*this, packageCount), 
+VersionProblem::VersionProblem(int packageCount, bool dumpStats)
+  : size(packageCount), version_constraint_count(0), dump_stats(dumpStats),
+    finalized(false), cur_package(0), package_versions(*this, packageCount), 
     disabled_package_variables(*this, packageCount, 0, 1), total_disabled(*this, 0, packageCount*MAX_TRUST_LEVEL),
     total_required_disabled(*this, 0, packageCount), total_induced_disabled(*this, 0, packageCount), 
     total_suspicious_disabled(*this, 0, packageCount),
@@ -61,8 +62,9 @@ VersionProblem::VersionProblem(int packageCount)
 }
 
 VersionProblem::VersionProblem(bool share, VersionProblem & s) 
-  : Space(share, s), size(s.size),
-    finalized(s.finalized), cur_package(s.cur_package),
+  : Space(share, s), 
+    size(s.size), version_constraint_count(s.version_constraint_count), dump_stats(s.dump_stats),
+    finalized(s.finalized), cur_package(s.cur_package), 
     disabled_package_variables(s.disabled_package_variables), total_disabled(s.total_disabled),
     total_required_disabled(s.total_required_disabled), total_induced_disabled(s.total_induced_disabled), 
     total_suspicious_disabled(s.total_suspicious_disabled),
@@ -135,7 +137,8 @@ VersionProblem::AddVersionConstraint(int packageId, int version,
   BoolVar version_match(*this, 0, 1);
   BoolVar depend_match(*this, 0, 1);
   BoolVar predicated_depend_match(*this, 0, 1);
-
+  
+  version_constraint_count++;
 #ifdef DEBUG
   std::cout << "Add VC for " << packageId << " @ " << version << " depPkg " << dependentPackageId;
   std::cout << " [ " << minDependentVersion << ", " << maxDependentVersion << " ]" << std::endl;
@@ -489,32 +492,39 @@ VersionProblem * VersionProblem::Solve(VersionProblem * problem)
   VersionProblem *best_solution = NULL;
   timer.start();
 
-  for (int k = 0; k < 1; k++)
-    {
+  Restart<VersionProblem> solver(problem);
+  best_solution = NULL;
 
-    Restart<VersionProblem> solver(problem);
-    best_solution = NULL;
-   
-    while (VersionProblem *solution = solver.next())
-      {
-	if (best_solution != NULL) 
-	  {
-	    delete best_solution;
-	  }
-	best_solution = solution;
-	++i;
+  while (VersionProblem *solution = solver.next())
+    {
+      if (best_solution != NULL) 
+        {
+          delete best_solution;
+        }
+      best_solution = solution;
+      ++i;
 #ifdef DEBUG
-	std::cout << "Trial Solution #" << i << "===============================" << std::endl;
-	const Search::Statistics & stats = solver.statistics();
-	std::cout << "Solver stats: Prop:" << stats.propagate << " Fail:" << stats.fail << " Node:" << stats.node;
-	std::cout << " Depth:" << stats.depth << " memory:" << stats.memory << std::endl;
-	solution->Print(std::cout);
+      std::cout << "Trial Solution #" << i << "===============================" << std::endl;
+      const Search::Statistics & stats = solver.statistics();
+      std::cout << "Solver stats: Prop:" << stats.propagate << " Fail:" << stats.fail << " Node:" << stats.node;
+      std::cout << " Depth:" << stats.depth << " memory:" << stats.memory << std::endl;
+      solution->Print(std::cout);
 #endif //DEBUG
-      }
-
   }
 
   double elapsed_time = timer.stop();
+
+  if (problem->dump_stats) {
+      std::cerr << "dep_selector solve: ";
+      std::cerr << (best_solution ? "SOLVED" : "FAILED") << " "; 
+      std::cerr << problem->size << " packages, " << problem->version_constraint_count << " constraints, ";
+      std::cerr << "Time: " << elapsed_time << "ms ";
+      const Search::Statistics & final_stats = solver.statistics();
+      std::cerr << "Stats: " << i << " steps, " << final_stats.memory << " bytes, ";
+      std::cerr << final_stats.propagate << " props, " << final_stats.node << " nodes, " << final_stats.depth << " depth ";
+      std::cerr << std::endl << std::flush;
+  }
+
 #ifdef DEBUG_LITE
   std::cout << "Solution completed: " << (best_solution ? "Found solution" : "No solution found") << std::endl;
   std::cout << "Solution consumed: " << elapsed_time << " ms " << i << " steps" << std::endl;

data/ext/dep_gecode/dep_selector_to_gecode.h

@@ -42,13 +42,13 @@ using namespace Gecode;
 
 class VersionProblem : public Space
 {
- public:
+public:
   static const int UNRESOLVED_VARIABLE;
   static const int MIN_TRUST_LEVEL;  
   static const int MAX_TRUST_LEVEL;
   static const int MAX_PREFERRED_WEIGHT;
 
-  VersionProblem(int packageCount);
+  VersionProblem(int packageCount, bool dumpStats = true);
   // Clone constructor; check gecode rules for this...
   VersionProblem(bool share, VersionProblem & s);
   virtual ~VersionProblem();
@@ -95,10 +95,11 @@ class VersionProblem : public Space
 
  protected:
   int size;
+  int version_constraint_count;
   int cur_package;
-  bool CheckPackageId(int id);
+  bool dump_stats;
   bool finalized;
-  //  std::vector<int> test;
+
   BoolVarArgs version_flags;
   IntVarArray package_versions;
   BoolVarArray disabled_package_variables;
@@ -112,11 +113,11 @@ class VersionProblem : public Space
   IntVar total_preferred_at_latest;
   IntVar total_not_preferred_at_latest;
 
-  int * disabled_package_weights;
   int * preferred_at_latest_weights;
   int * is_required;
   int * is_suspicious;
 
+  bool CheckPackageId(int id);
   void AddPackagesPreferredToBeAtLatestObjectiveFunction(const VersionProblem & best_known_solution);
   void ConstrainVectorLessThanBest(IntVarArgs & current, IntVarArgs & best);
   void BuildCostVector(IntVarArgs & costVector) const;

data/ext/dep_gecode/dep_selector_to_gecode_interface.cpp

@@ -29,9 +29,9 @@
 //  insure proper memory behaviour
 
 // FFI friendly
-VersionProblem * VersionProblemCreate(int packageCount) 
+VersionProblem * VersionProblemCreate(int packageCount, bool dump_stats) 
 {
-  return new VersionProblem(packageCount);
+        return new VersionProblem(packageCount, dump_stats);
 }
 
 void VersionProblemDestroy(VersionProblem * p)

data/ext/dep_gecode/dep_selector_to_gecode_interface.h

@@ -31,7 +31,7 @@ extern "C" {
   typedef struct VersionProblem VersionProblem;
 #endif // __cplusplus
 
-  VersionProblem * VersionProblemCreate(int packageCount);
+  VersionProblem * VersionProblemCreate(int packageCount, bool dumpStats);
   void VersionProblemDestroy(VersionProblem * vp);
 
 

data/lib/dep_selector/dep_selector_version.rb

@@ -1,3 +1,3 @@
 module DepSelector
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/dep_selector/gecode_wrapper.rb

@@ -30,7 +30,7 @@ module DepSelector
     # modeled after http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
     def initialize(problem_or_package_count)
       if (problem_or_package_count.is_a?(Numeric))
-        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count)
+        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count, true)
       else
         @gecode_problem = problem_or_package_count
       end

metadata

@@ -2,7 +2,7 @@
 name: dep_selector
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Christopher Walters
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []