dep_selector 0.0.8 → 0.1.1

data/ext/dep_gecode/dep_selector_to_gecode.h

@@ -53,6 +53,7 @@ struct VersionProblemPool
     void DeleteAll();
 };
 
+#define DEBUG_PREFIX_LENGTH 40
 
 class VersionProblem : public Space
 {
@@ -62,7 +63,11 @@ public:
   static const int MAX_TRUST_LEVEL;
   static const int MAX_PREFERRED_WEIGHT;
 
-  VersionProblem(int packageCount, bool dumpStats = true, bool debug = false);
+  static int instance_counter;
+
+    VersionProblem(int packageCount, bool dumpStats = true, 
+                   bool debug = false, 
+                   const char * logId = 0);
   // Clone constructor; check gecode rules for this...
   VersionProblem(bool share, VersionProblem & s);
   virtual ~VersionProblem();
@@ -103,17 +108,20 @@ public:
   // Debug and utility functions
   void Print(std::ostream &out);
   void PrintPackageVar(std::ostream & out, int packageId) ;
+  const char * DebugPrefix() const { return debugPrefix; }
 
-    static VersionProblem *InnerSolve(VersionProblem * problem, int & itercount);
+  static VersionProblem *InnerSolve(VersionProblem * problem, int & itercount);
   static VersionProblem *Solve(VersionProblem *problem);
- 
 
  protected:
+  int instance_id;
   int size;
   int version_constraint_count;
   int cur_package;
   bool dump_stats;
-  bool debug_logging;
+  bool debugLogging;
+  char debugPrefix[DEBUG_PREFIX_LENGTH];
+  char outputBuffer[1024];
   bool finalized;
 
   BoolVarArgs version_flags;
@@ -139,7 +147,7 @@ public:
   void AddPackagesPreferredToBeAtLatestObjectiveFunction(const VersionProblem & best_known_solution);
   void ConstrainVectorLessThanBest(IntVarArgs & current, IntVarArgs & best);
   void BuildCostVector(IntVarArgs & costVector) const;
-  
+ 
   friend class VersionProblemPool;
 };
 

data/ext/dep_gecode/dep_selector_to_gecode_interface.cpp

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

data/ext/dep_gecode/dep_selector_to_gecode_interface.h

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

data/ext/dep_gecode/extconf.rb

@@ -23,16 +23,34 @@
 # to work properly here.
 require 'mkmf'
 
-$LIBS << " -lstdc++"
-
 # $CFLAGS << "-g"
 
 gecode_installed =
-  have_library('gecodesearch') &&
-  have_library('gecodeint') &&
-  have_library('gecodekernel') &&
+  # Gecode documentation notes:
+  # "Some linkers require the list of libraries to be sorted such that
+  # libraries appear before all libraries they depend on."
+  # http://www.gecode.org/doc-latest/MPG.pdf
+  #
+  # This appears to be true of the version of mingw that ships with Ruby 1.9.3.
+  # The correct order of `-l` flags according to the docs is:
+  #
+  # 1. -lgecodeflatzinc
+  # 2. -lgecodedriver
+  # 3. -lgecodegist
+  # 4. -lgecodesearch,
+  # 5. -lgecodeminimodel
+  # 6. -lgecodeset
+  # 7. -lgecodefloat
+  # 8. -lgecodeint
+  # 9. -lgecodekernel
+  # 10. -lgecodesupport
+  #
+  # Ruby `mkmf` will add `-l` flags in the _REVERSE_ order that they appear here.
   have_library('gecodesupport') &&
-  have_library('gecodeminimodel')
+  have_library('gecodekernel') &&
+  have_library('gecodeint') &&
+  have_library('gecodeminimodel') &&
+  have_library('gecodesearch')
 
 unless gecode_installed
   STDERR.puts <<EOS

data/lib/dep_selector/dep_selector_version.rb

@@ -1,3 +1,3 @@
 module DepSelector
-  VERSION = "0.0.8"
+  VERSION = "0.1.1"
 end

data/lib/dep_selector/dependency_graph.rb

@@ -26,6 +26,8 @@ require 'dep_selector/gecode_wrapper'
 module DepSelector
   class DependencyGraph
 
+    DebugOptionFile = "/tmp/DepSelectorDebugOn"
+
     attr_reader :packages
 
     def initialize
@@ -58,10 +60,11 @@ module DepSelector
             packages.map{ |name, pkg| pkg }
           end
 
+        debugFlag = DebugOptionFile && File::exists?(DebugOptionFile)
         # In addition to all the packages that the user specified,
         # there is a "ghost" package that contains the solution
         # constraints. See Selector#solve for more information.
-        @gecode_wrapper = GecodeWrapper.new(packages_in_solve.size + 1)
+        @gecode_wrapper = GecodeWrapper.new(packages_in_solve.size + 1, debugFlag)
         packages_in_solve.each{ |pkg| pkg.generate_gecode_wrapper_constraints }
       end
     end

data/lib/dep_selector/error_reporter/simple_tree_traverser.rb

@@ -78,11 +78,15 @@ module DepSelector
 
         # determine all versions of curr_pkg that match
         # version_constraint and recurse into them
+        seen_dep_trees = {}
         curr_pkg[version_constraint].each do |curr_pkg_ver|
+          next if seen_dep_trees.has_key?(curr_pkg_ver.dependencies.to_s)
           curr_path.push(curr_pkg_ver)
           curr_pkg_ver.dependencies.each do |dep|
+            next if curr_pkg.name == dep.package.name
             paths_to_pkg(dep_graph, dep.package, dep.constraint, target_pkg, curr_path, all_paths)
           end
+          seen_dep_trees[curr_pkg_ver.dependencies.to_s] = true
           curr_path.pop
         end
       end

data/lib/dep_selector/exceptions.rb

@@ -38,6 +38,11 @@ module DepSelector
       end
     end
 
+    class TimeBoundExceeded < StandardError
+    end
+    class TimeBoundExceededNoSolution < StandardError
+    end
+
     # This exception is thrown by gecode_wrapper and only used
     # internally
     class NoSolutionFound < StandardError

data/lib/dep_selector/gecode_wrapper.rb

@@ -17,22 +17,25 @@
 # limitations under the License.
 #
 
+require "uuidtools"
 require "dep_gecode"
 require 'dep_selector/exceptions'
 
 module DepSelector
   class GecodeWrapper
     attr_reader :gecode_problem
+    attr_reader :debug_logs_on
     DontCareConstraint = -1
     NoMatchConstraint = -2
     DumpStatistics = true
-    DebugLogsOn = false
     
     # This insures that we properly deallocate the c++ class at the heart of dep_gecode.
     # modeled after http://www.mikeperham.com/2010/02/24/the-trouble-with-ruby-finalizers/
-    def initialize(problem_or_package_count)
+    def initialize(problem_or_package_count, debug=false)
       if (problem_or_package_count.is_a?(Numeric))
-        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count, DumpStatistics, DebugLogsOn)
+        logId = UUIDTools::UUID.random_create().to_str()
+        @debug_logs_on = debug
+        @gecode_problem = Dep_gecode.VersionProblemCreate(problem_or_package_count, DumpStatistics, debug, logId)
       else
         @gecode_problem = problem_or_package_count
       end
@@ -142,7 +145,7 @@ module DepSelector
 
     def solve()
       raise "Gecode internal failure (solve)" if gecode_problem.nil?
-      solution = GecodeWrapper.new(Dep_gecode.Solve(gecode_problem))
+      solution = GecodeWrapper.new(Dep_gecode.Solve(gecode_problem), debug_logs_on)
       raise "Gecode internal failure (no solution found)" if (solution.nil?)
 
       raise Exceptions::NoSolutionFound.new(solution) if solution.package_disabled_count > 0

data/lib/dep_selector/selector.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+require 'timeout'
 require 'dep_selector/dependency_graph'
 require 'dep_selector/exceptions'
 require 'dep_selector/error_reporter'
@@ -29,12 +30,13 @@ require 'dep_selector/error_reporter/simple_tree_traverser'
 # constraint that makes a solution impossible.
 module DepSelector
   class Selector
-    attr_accessor :dep_graph, :error_reporter
+    attr_accessor :dep_graph, :error_reporter, :time_bound
 
     DEFAULT_ERROR_REPORTER = ErrorReporter::SimpleTreeTraverser.new
 
-    def initialize(dep_graph, error_reporter = DEFAULT_ERROR_REPORTER)
+    def initialize(dep_graph, time_bound = 5, error_reporter = DEFAULT_ERROR_REPORTER)
       @dep_graph = dep_graph
+      @time_bound = time_bound
       @error_reporter = error_reporter
     end
 
@@ -65,8 +67,10 @@ module DepSelector
       packages_to_include_in_solve = trim_unreachable_packages(dep_graph, solution_constraints)
 
       begin
-        # first, try to solve the whole set of constraints
-        solve(dep_graph.clone, solution_constraints, valid_packages, packages_to_include_in_solve)
+        Timeout::timeout(@time_bound, Exceptions::TimeBoundExceeded) do 
+          # first, try to solve the whole set of constraints
+          solve(dep_graph.clone, solution_constraints, valid_packages, packages_to_include_in_solve)
+        end
       rescue Exceptions::NoSolutionFound
         # since we're here, solving the whole system failed, so add
         # the solution_constraints one-by-one and try to solve in
@@ -79,48 +83,50 @@ module DepSelector
         # iteratively add and solve in order to re-use
         # propagations. This will require separating setting up the
         # constraints from searching for the solution.
-        solution_constraints.each_index do |idx|
-          workspace = dep_graph.clone
-          begin
-            solve(workspace, solution_constraints[0..idx], valid_packages, packages_to_include_in_solve)
-          rescue Exceptions::NoSolutionFound => nsf
-            disabled_packages =
-              packages_to_include_in_solve.inject([]) do |acc, elt|
+        Timeout::timeout(@time_bound, Exceptions::TimeBoundExceededNoSolution) do
+          solution_constraints.each_index do |idx|
+            workspace = dep_graph.clone
+            begin
+              solve(workspace, solution_constraints[0..idx], valid_packages, packages_to_include_in_solve)
+            rescue Exceptions::NoSolutionFound => nsf
+              disabled_packages =
+                packages_to_include_in_solve.inject([]) do |acc, elt|
                 pkg = workspace.package(elt.name)
                 acc << pkg if nsf.unsatisfiable_problem.is_package_disabled?(pkg.gecode_package_id)
                 acc
               end
-            # disambiguate between packages disabled becuase they
+              # disambiguate between packages disabled becuase they
             # don't exist and those that have otherwise problematic
-            # constraints
-            disabled_non_existent_packages = []
-            disabled_most_constrained_packages = []
-            disabled_packages.each do |disabled_pkg|
-              disabled_collection =
-                if disabled_pkg.valid? || (valid_packages && valid_packages.include?(disabled_pkg))
-                  disabled_most_constrained_packages
-                else
-                  disabled_non_existent_packages
-                end
-              disabled_collection << disabled_pkg
+              # constraints
+              disabled_non_existent_packages = []
+              disabled_most_constrained_packages = []
+              disabled_packages.each do |disabled_pkg|
+                disabled_collection =
+                  if disabled_pkg.valid? || (valid_packages && valid_packages.include?(disabled_pkg))
+                    disabled_most_constrained_packages
+                  else
+                    disabled_non_existent_packages
+                  end
+                disabled_collection << disabled_pkg
+              end
+              
+              # Pick the first non-existent or most-constrained package
+              # that was required or the package whose constraints had
+              # to be disabled in order to find a solution and generate
+              # feedback for it. We only report feedback for one
+              # package, because it is in fact actionable and dispalying
+              # feedback for every disabled package would probably be
+              # too long. The full set of disabled packages is
+              # accessible in the NoSolutionExists exception.
+              disabled_package_to_report_on = disabled_non_existent_packages.first ||
+                disabled_most_constrained_packages.first
+              feedback = error_reporter.give_feedback(dep_graph, solution_constraints, idx,
+                                                      disabled_package_to_report_on)
+              
+              raise Exceptions::NoSolutionExists.new(feedback, solution_constraints[idx],
+                                                     disabled_non_existent_packages,
+                                                     disabled_most_constrained_packages)
             end
-
-            # Pick the first non-existent or most-constrained package
-            # that was required or the package whose constraints had
-            # to be disabled in order to find a solution and generate
-            # feedback for it. We only report feedback for one
-            # package, because it is in fact actionable and dispalying
-            # feedback for every disabled package would probably be
-            # too long. The full set of disabled packages is
-            # accessible in the NoSolutionExists exception.
-            disabled_package_to_report_on = disabled_non_existent_packages.first ||
-                                            disabled_most_constrained_packages.first
-            feedback = error_reporter.give_feedback(dep_graph, solution_constraints, idx,
-                                                    disabled_package_to_report_on)
-
-            raise Exceptions::NoSolutionExists.new(feedback, solution_constraints[idx],
-                                                   disabled_non_existent_packages,
-                                                   disabled_most_constrained_packages)
           end
         end
       end

metadata

@@ -1,35 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dep_selector
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Christopher Walters
 - Mark Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-06 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: Given packages, versions, and a dependency graph, find a valid assignment of package versions
-email: 
+date: 2014-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+description: Given packages, versions, and a dependency graph, find a valid assignment
+  of package versions
+email:
 - cw@opscode.com
 - mark@opscode.com
 executables: []
-
-extensions: 
+extensions:
 - ext/dep_gecode/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/dep_selector/densely_packed_set.rb
 - lib/dep_selector/dep_selector_version.rb
 - lib/dep_selector/dependency.rb
@@ -53,36 +86,31 @@ files:
 - ext/dep_gecode/dep_selector_to_gecode_interface.cpp
 - ext/dep_gecode/extconf.rb
 - ext/dep_gecode/lib/dep_selector_to_gecode.rb
-has_rdoc: false
 homepage: http://github.com/algorist/dep_selector
-licenses: 
+licenses:
 - Apache v2
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - gecode, version 3.5 or greater
 - g++
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Given packages, versions, and a dependency graph, find a valid assignment of package versions
+specification_version: 4
+summary: Given packages, versions, and a dependency graph, find a valid assignment
+  of package versions
 test_files: []
-