December 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8169 - /trunk/sat-solver/bindings/ruby/tests/problems.rb
by kkaempf＠svn.opensuse.org 31 Dec '07

31 Dec '07

Author: kkaempf Date: Mon Dec 31 17:10:34 2007 New Revision: 8169 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8169&view=rev Log: trying to produce more errors, not very successful :-( Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Mon Dec 31 17:10:34 2007 @@ -3,40 +3,38 @@ require 'test/unit' require 'satsolver' -def solve_and_check pool, installed, transaction, problem +def solve_and_check solver, transaction, problem - solver = pool.create_solver( installed ) - solver.solve( transaction ) assert solver.problems? - puts "Problems found" + puts "[#{problem}] Problems found" i = 0 found = false solver.each_problem( transaction ) { |p| found = true if p.reason == problem i += 1 case p.reason - when SatSolver::SOLVER_PROBLEM_UPDATE_RULE + when SatSolver::SOLVER_PROBLEM_UPDATE_RULE #1 reason = "problem with installed" - when SatSolver::SOLVER_PROBLEM_JOB_RULE + when SatSolver::SOLVER_PROBLEM_JOB_RULE #2 reason = "conflicting requests" - when SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP + when SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP #3 reason = "nothing provides requested" - when SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE + when SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE #4 reason = "not installable" - when SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP + when SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP #5 reason = "nothing provides rel required by source" - when SatSolver::SOLVER_PROBLEM_SAME_NAME + when SatSolver::SOLVER_PROBLEM_SAME_NAME #6 reason = "cannot install both" - when SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT + when SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT #7 reason = "source conflicts with rel provided by target" - when SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES + when SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES #8 reason = "source obsoletes rel provided by target" - when SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE + when SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE #9 reason = "source requires rel but no providers are installable" else reason = "**unknown**" end - puts "#{i}: [#{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" + puts "#{i}: [#{p.reason}]: #{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" } return found end @@ -64,40 +62,77 @@ def test_update_rule transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_UPDATE_RULE ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_UPDATE_RULE ) end def test_job_rule transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_JOB_RULE ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_JOB_RULE ) end def test_job_nothing_provides transaction = @pool.create_transaction - solv = @pool.find( "A", @repo ) - solv.requires << @pool.create_relation( "ZZ" ) - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) end def test_not_installable transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) + solv = @pool.find( "A", @repo ) + solv.requires << @pool.create_relation( "ZZ" ) + transaction.install( solv ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) end def test_nothing_provides transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) + solvA = @pool.find( "A", @repo ) + solvA.requires << @pool.create_relation( "B", SatSolver::REL_GE, "2.0-0" ) + solvB = @pool.find( "B", @repo ) + solvB.requires << @pool.create_relation( "ZZ" ) + transaction.install( solvA ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) end def test_same_name transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_SAME_NAME ) + solvA = @pool.find( "A", @repo ) + transaction.install( solvA ) + solvA = @repo.create_solvable( "A", "2.0-0" ) + transaction.install( solvA ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_SAME_NAME ) end def test_package_conflict transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) + solvA = @pool.find( "A", @repo ) + solvB = @pool.find( "B", @repo ) + solvA.conflicts << @pool.create_relation( solvB.name, SatSolver::REL_EQ, solvB.evr ) + solvB.conflicts << @pool.create_relation( solvA.name, SatSolver::REL_EQ, solvA.evr ) + transaction.install( solvA ) + transaction.install( solvB ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) end def test_package_obsoletes transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) + solvCC = @pool.find( "CC", @repo ) + solvCC.obsoletes << @pool.create_relation( "A" ) + transaction.install( solvCC ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) end def test_providers_not_installable transaction = @pool.create_transaction - assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) + solver = @pool.create_solver( @installed ) + solver.solve( transaction ) + assert solve_and_check( solver, transaction, SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) end end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8168 - in /trunk/sat-solver/bindings: ruby/tests/problems.rb satsolver.i
by kkaempf＠svn.opensuse.org 31 Dec '07

31 Dec '07

Author: kkaempf Date: Mon Dec 31 16:34:22 2007 New Revision: 8168 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8168&view=rev Log: refactor problem test case (backup copy, unfinished) add Pool.create_relation make Python compile again Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Mon Dec 31 16:34:22 2007 @@ -3,49 +3,18 @@ require 'test/unit' require 'satsolver' -class ProblemTest < Test::Unit::TestCase - def test_problems - pool = SatSolver::Pool.new - assert pool - - installed = pool.create_repo( 'system' ) - assert installed - installed.create_solvable( 'A', '0.0-0' ) - installed.create_solvable( 'B', '1.0-0' ) - solv = installed.create_solvable( 'C', '2.0-0' ) - solv.requires << SatSolver::Relation.new( pool, "D", SatSolver::REL_EQ, "3.0-0" ) - installed.create_solvable( 'D', '3.0-0' ) - - repo = pool.create_repo( 'test' ) - assert repo - - solv1 = repo.create_solvable( 'A', '1.0-0' ) - assert solv1 - solv1.obsoletes << SatSolver::Relation.new( pool, "C" ) - solv1.requires << SatSolver::Relation.new( pool, "B", SatSolver::REL_GT, "2.0-0" ) - - solv2 = repo.create_solvable( 'B', '2.0-0' ) - assert solv2 - - solv3 = repo.create_solvable( 'CC', '3.3-0' ) -# solv3.requires << SatSolver::Relation.new( pool, "Z" ) - repo.create_solvable( 'DD', '4.4-0' ) - - - transaction = pool.create_transaction - transaction.install( solv1 ) - transaction.remove( "Z" ) - - solver = pool.create_solver( installed ) -# solver.allow_uninstall = 1; -# @pool.debug = 255 - solver.solve( transaction ) - assert solver.problems? - puts "Problems found" - i = 0 - solver.each_problem( transaction ) { |p| - i += 1 - case p.reason +def solve_and_check pool, installed, transaction, problem + + solver = pool.create_solver( installed ) + solver.solve( transaction ) + assert solver.problems? + puts "Problems found" + i = 0 + found = false + solver.each_problem( transaction ) { |p| + found = true if p.reason == problem + i += 1 + case p.reason when SatSolver::SOLVER_PROBLEM_UPDATE_RULE reason = "problem with installed" when SatSolver::SOLVER_PROBLEM_JOB_RULE @@ -66,8 +35,69 @@ reason = "source requires rel but no providers are installable" else reason = "**unknown**" - end - puts "#{i}: [#{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" - } + end + puts "#{i}: [#{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" + } + return found +end + +class ProblemTest < Test::Unit::TestCase + def setup + @pool = SatSolver::Pool.new + assert @pool + + @installed = @pool.create_repo( 'system' ) + assert @installed + @installed.create_solvable( 'A', '0.0-0' ) + @installed.create_solvable( 'B', '1.0-0' ) + @installed.create_solvable( 'C', '2.0-0' ) + @installed.create_solvable( 'D', '3.0-0' ) + + @repo = @pool.create_repo( 'test' ) + assert @repo + @repo.create_solvable( 'A', '1.0-0' ) + @repo.create_solvable( 'B', '2.0-0' ) + @repo.create_solvable( 'CC', '3.3-0' ) + @repo.create_solvable( 'DD', '4.4-0' ) + + end + + def test_update_rule + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_UPDATE_RULE ) + end + def test_job_rule + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_JOB_RULE ) + end + def test_job_nothing_provides + transaction = @pool.create_transaction + solv = @pool.find( "A", @repo ) + solv.requires << @pool.create_relation( "ZZ" ) + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) + end + def test_not_installable + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) + end + def test_nothing_provides + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) + end + def test_same_name + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_SAME_NAME ) + end + def test_package_conflict + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) + end + def test_package_obsoletes + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) + end + def test_providers_not_installable + transaction = @pool.create_transaction + assert solve_and_check( @pool, @installed, transaction, SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) end end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Mon Dec 31 16:34:22 2007 @@ -181,6 +181,7 @@ Id target; /* solvable id */ } Problem; +#if defined(SWIGRUBY) static Problem *problem_new( Solver *s, Transaction *t, Id id ) { Id prule; @@ -193,6 +194,7 @@ p->reason = solver_problemruleinfo( s, &(t->queue), prule, &(p->relation), &(p->source), &(p->target) ); return p; } +#endif #define SOLUTION_UNKNOWN 0 #define SOLUTION_NOKEEP_INSTALLED 1 @@ -219,6 +221,7 @@ Id n2; } Solution; +#if defined(SWIGRUBY) static Solution *solution_new( Pool *pool, int solution, Id s1, Id n1, Id s2, Id n2 ) { Solution *s = (Solution *)malloc( sizeof( Solution )); @@ -230,6 +233,7 @@ s->n2 = n2; return s; } +#endif %} @@ -409,6 +413,20 @@ } /* + * Relation management + */ + + Relation *create_relation( const char *name, int op = 0, const char *evr = NULL ) + { + Id name_id = str2id( $self, name, 1 ); + Id evr_id = 0; + if (evr) + evr_id = str2id( $self, evr, 1 ); + Id rel = rel2id( $self, name_id, evr_id, op, 1 ); + return relation_new( $self, rel ); + } + + /* * Solvable management */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8167 - in /trunk/sat-solver/bindings: ruby/tests/solutions.rb satsolver.i
by kkaempf＠svn.opensuse.org 31 Dec '07

31 Dec '07

Author: kkaempf Date: Mon Dec 31 16:13:29 2007 New Revision: 8167 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8167&view=rev Log: add solution testcase workaround swigs rename of Xn -> X_n Added: trunk/sat-solver/bindings/ruby/tests/solutions.rb Modified: trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/ruby/tests/solutions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solutions.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/solutions.rb Mon Dec 31 16:13:29 2007 @@ -0,0 +1,112 @@ +$: << "../../../build/bindings/ruby" +# test Solutions +require 'test/unit' +require 'satsolver' + +class SolutionTest < Test::Unit::TestCase + def test_solutions + pool = SatSolver::Pool.new + assert pool + + installed = pool.create_repo( 'system' ) + assert installed + installed.create_solvable( 'A', '0.0-0' ) + installed.create_solvable( 'B', '1.0-0' ) + solv = installed.create_solvable( 'C', '2.0-0' ) + solv.requires << SatSolver::Relation.new( pool, "D", SatSolver::REL_EQ, "3.0-0" ) + installed.create_solvable( 'D', '3.0-0' ) + + repo = pool.create_repo( 'test' ) + assert repo + + solv1 = repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv1.obsoletes << SatSolver::Relation.new( pool, "C" ) + solv1.requires << SatSolver::Relation.new( pool, "B", SatSolver::REL_GT, "2.0-0" ) + + solv2 = repo.create_solvable( 'B', '2.0-0' ) + assert solv2 + + solv3 = repo.create_solvable( 'CC', '3.3-0' ) +# solv3.requires << SatSolver::Relation.new( pool, "Z" ) + repo.create_solvable( 'DD', '4.4-0' ) + + + transaction = pool.create_transaction + transaction.install( solv1 ) + transaction.remove( "Z" ) + + solver = pool.create_solver( installed ) +# solver.allow_uninstall = 1; +# @pool.debug = 255 + solver.solve( transaction ) + assert solver.problems? + puts "Problems found" + i = 0 + solver.each_problem( transaction ) { |p| + i += 1 + case p.reason + when SatSolver::SOLVER_PROBLEM_UPDATE_RULE + reason = "problem with installed" + when SatSolver::SOLVER_PROBLEM_JOB_RULE + reason = "conflicting requests" + when SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP + reason = "nothing provides requested" + when SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE + reason = "not installable" + when SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP + reason = "nothing provides rel required by source" + when SatSolver::SOLVER_PROBLEM_SAME_NAME + reason = "cannot install both" + when SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT + reason = "source conflicts with rel provided by target" + when SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES + reason = "source obsoletes rel provided by target" + when SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE + reason = "source requires rel but no providers are installable" + else + reason = "**unknown**" + end + puts "#{i}: [#{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" + j = 0 + p.each_solution { |s| + j += 1 + case s.solution + when SatSolver::SOLUTION_UNKNOWN + solution = "None available" + when SatSolver::SOLUTION_NOKEEP_INSTALLED + solution = "dont keep installed" + when SatSolver::SOLUTION_NOINSTALL_SOLV + solution = "dont install solvable" + when SatSolver::SOLUTION_NOREMOVE_SOLV + solution = "dont remove solvable" + when SatSolver::SOLUTION_NOFORBID_INSTALL + solution = "dont forbid install" + when SatSolver::SOLUTION_NOINSTALL_NAME + solution = "dont install name" + when SatSolver::SOLUTION_NOREMOVE_NAME + solution = "dont remove name" + when SatSolver::SOLUTION_NOINSTALL_REL + solution = "dont install relation" + when SatSolver::SOLUTION_NOREMOVE_REL + solution = "dont remove relation" + when SatSolver::SOLUTION_NOUPDATE + solution = "dont update" + when SatSolver::SOLUTION_ALLOW_DOWNGRADE + solution = "allow downgrade" + when SatSolver::SOLUTION_ALLOW_ARCHCHANGE + solution = "allow architecture change" + when SatSolver::SOLUTION_ALLOW_VENDORCHANGE + solution = "allow vendor change" + when SatSolver::SOLUTION_ALLOW_REPLACEMENT + solution = "allow replacement" + when SatSolver::SOLUTION_ALLOW_REMOVE + solution = "allow removal" + else + solution = "**UNKNOWN**" + end + puts " #{j}: [#{solution}] #{s.s1}" + } + } + end +end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Mon Dec 31 16:13:29 2007 @@ -1043,19 +1043,39 @@ /* Solution */ %extend Solution { - %constant int SOLUTION_UPDATE_RULE = 1; + %constant int SOLUTION_UNKNOWN = 0; + %constant int SOLUTION_NOKEEP_INSTALLED = 1; + %constant int SOLUTION_NOINSTALL_SOLV = 2; + %constant int SOLUTION_NOREMOVE_SOLV = 3; + %constant int SOLUTION_NOFORBID_INSTALL = 4; + %constant int SOLUTION_NOINSTALL_NAME = 5; + %constant int SOLUTION_NOREMOVE_NAME = 6; + %constant int SOLUTION_NOINSTALL_REL = 7; + %constant int SOLUTION_NOREMOVE_REL = 8; + %constant int SOLUTION_NOUPDATE = 9; + %constant int SOLUTION_ALLOW_DOWNGRADE = 10; + %constant int SOLUTION_ALLOW_ARCHCHANGE = 11; + %constant int SOLUTION_ALLOW_VENDORCHANGE = 12; + %constant int SOLUTION_ALLOW_REPLACEMENT = 13; + %constant int SOLUTION_ALLOW_REMOVE = 14; ~Solution() { free ($self); } int solution() { return $self->solution; } + /* without the %rename, swig converts it to 's_1'. Ouch! */ + %rename( "s1" ) s1( ); Solvable *s1() { return pool_id2solvable( $self->pool, $self->s1 ); } + %rename( "n1" ) n1( ); const char *n1() { return id2str( $self->pool, $self->n1 ); } + %rename( "r1" ) r1( ); Relation *r1() { return relation_new( $self->pool, $self->n1 ); } + %rename( "s2" ) s2( ); Solvable *s2() { return pool_id2solvable( $self->pool, $self->s2 ); } + %rename( "n2" ) n2( ); const char *n2() { return id2str( $self->pool, $self->n2 ); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8166 - in /trunk/sat-solver/bindings: ruby/tests/decisions.rb ruby/tests/problems.rb satsolver.i
by kkaempf＠svn.opensuse.org 31 Dec '07

31 Dec '07

Author: kkaempf Date: Mon Dec 31 15:47:29 2007 New Revision: 8166 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8166&view=rev Log: enhance Problem add Solution + iterator Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/ruby/tests/problems.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/d… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Mon Dec 31 15:47:29 2007 @@ -40,7 +40,7 @@ solver.allow_uninstall = 1; # @pool.debug = 255 solver.solve( transaction ) - puts "#{solver.problem_count} problems found" + puts "** Problems found" if solver.problems? assert solver.decision_count > 0 i = 0 solver.each_decision { |d| Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Mon Dec 31 15:47:29 2007 @@ -40,8 +40,8 @@ # solver.allow_uninstall = 1; # @pool.debug = 255 solver.solve( transaction ) - puts "#{solver.problem_count} problems found" - assert solver.problem_count > 0 + assert solver.problems? + puts "Problems found" i = 0 solver.each_problem( transaction ) { |p| i += 1 Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Mon Dec 31 15:47:29 2007 @@ -172,22 +172,65 @@ } typedef struct _Problem { + Solver *solver; + Transaction *transaction; + Id id; /* problem id */ int reason; - Solvable *source; - Relation *relation; - Solvable *target; + Id source; /* solvable id */ + Id relation; /* relation id */ + Id target; /* solvable id */ } Problem; -static Problem *problem_new( int reason, Solvable *source, Relation *relation, Solvable *target ) +static Problem *problem_new( Solver *s, Transaction *t, Id id ) { + Id prule; + Problem *p = (Problem *)malloc( sizeof( Problem )); - p->reason = reason; - p->source = source; - p->relation = relation; - p->target = target; + p->solver = s; + p->transaction = t; + p->id = id; + prule = solver_findproblemrule( s, id ); + p->reason = solver_problemruleinfo( s, &(t->queue), prule, &(p->relation), &(p->source), &(p->target) ); return p; } +#define SOLUTION_UNKNOWN 0 +#define SOLUTION_NOKEEP_INSTALLED 1 +#define SOLUTION_NOINSTALL_SOLV 2 +#define SOLUTION_NOREMOVE_SOLV 3 +#define SOLUTION_NOFORBID_INSTALL 4 +#define SOLUTION_NOINSTALL_NAME 5 +#define SOLUTION_NOREMOVE_NAME 6 +#define SOLUTION_NOINSTALL_REL 7 +#define SOLUTION_NOREMOVE_REL 8 +#define SOLUTION_NOUPDATE 9 +#define SOLUTION_ALLOW_DOWNGRADE 10 +#define SOLUTION_ALLOW_ARCHCHANGE 11 +#define SOLUTION_ALLOW_VENDORCHANGE 12 +#define SOLUTION_ALLOW_REPLACEMENT 13 +#define SOLUTION_ALLOW_REMOVE 14 + +typedef struct _Solution { + Pool *pool; + int solution; + Id s1; + Id n1; + Id s2; + Id n2; +} Solution; + +static Solution *solution_new( Pool *pool, int solution, Id s1, Id n1, Id s2, Id n2 ) +{ + Solution *s = (Solution *)malloc( sizeof( Solution )); + s->pool = pool; + s->solution = solution; + s->s1 = s1; + s->n1 = n1; + s->s2 = s2; + s->n2 = n2; + return s; +} + %} /*-------------------------------------------------------------*/ @@ -244,6 +287,10 @@ %rename(Problem) _Problem; typedef struct _Problem {} Problem; +%nodefault _Solution; +%rename(Solution) _Solution; +typedef struct _Solution {} Solution; + /*-------------------------------------------------------------*/ /* Pool */ @@ -877,17 +924,142 @@ %constant int SOLVER_PROBLEM_PACKAGE_CONFLICT = 7; %constant int SOLVER_PROBLEM_PACKAGE_OBSOLETES = 8; %constant int SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE = 8; + ~Problem() + { free ($self); } int reason() { return $self->reason; } Solvable *source() - { return $self->source; } + { return pool_id2solvable( $self->solver->pool, $self->source); } Relation *relation() - { return $self->relation; } + { return relation_new( $self->solver->pool, $self->relation); } Solvable *target() - { return $self->target; } + { return pool_id2solvable( $self->solver->pool, $self->target); } +#if defined(SWIGRUBY) + void each_solution() + { + Id solution = 0; + while ((solution = solver_next_solution( $self->solver, $self->id, solution )) != 0) { + Id p, rp, element, what; + + Id s1, s2, n1, n2; + int code = SOLUTION_UNKNOWN; + + Solver *solver = $self->solver; + Pool *pool = solver->pool; + element = 0; + s1 = s2 = n1 = n2 = 0; + + while ((element = solver_next_solutionelement( solver, $self->id, solution, element, &p, &rp)) != 0) { + if (p == 0) { + + /* job, rp is index into job queue */ + what = $self->transaction->queue.elements[rp]; + + switch ($self->transaction->queue.elements[rp - 1]) { + case SOLVER_INSTALL_SOLVABLE: + s1 = what; + if (solver->installed + && (pool->solvables + s1)->repo == solver->installed) + code = SOLUTION_NOKEEP_INSTALLED; /* s1 */ + else + code = SOLUTION_NOINSTALL_SOLV; /* s1 */ + break; + case SOLVER_ERASE_SOLVABLE: + s1 = what; + if (solver->installed + && (pool->solvables + s1)->repo == solver->installed) + code = SOLUTION_NOREMOVE_SOLV; /* s1 */ + else + code = SOLUTION_NOFORBID_INSTALL; /* s1 */ + break; + case SOLVER_INSTALL_SOLVABLE_NAME: + n1 = what; + code = SOLUTION_NOINSTALL_NAME; /* n1 */ + break; + case SOLVER_ERASE_SOLVABLE_NAME: + n1 = what; + code = SOLUTION_NOREMOVE_NAME; /* n1 */ + break; + case SOLVER_INSTALL_SOLVABLE_PROVIDES: + n1 = what; + code = SOLUTION_NOINSTALL_REL; /* r1 */ + break; + case SOLVER_ERASE_SOLVABLE_PROVIDES: + n1 = what; + code = SOLUTION_NOREMOVE_REL; /* r1 */ + break; + case SOLVER_INSTALL_SOLVABLE_UPDATE: + s1 = what; + code = SOLUTION_NOUPDATE; + break; + default: + code = SOLUTION_UNKNOWN; + break; + } + } + else { + s1 = p; + s2 = rp; + /* policy, replace p with rp */ + Solvable *sp = pool->solvables + p; + Solvable *sr = rp ? pool->solvables + rp : 0; + if (sr) { + if (!solver->allowdowngrade + && evrcmp( pool, sp->evr, sr->evr, EVRCMP_MATCH_RELEASE ) > 0) { + code = SOLUTION_ALLOW_DOWNGRADE; + } + else if (!solver->allowarchchange + && sp->name == sr->name + && sp->arch != sr->arch + && policy_illegal_archchange( pool, sp, sr ) ) { + code = SOLUTION_ALLOW_ARCHCHANGE; /* s1, s2 */ + } + else if (!solver->allowvendorchange + && sp->name == sr->name + && sp->vendor != sr->vendor + && policy_illegal_vendorchange( pool, sp, sr ) ) { + n1 = sp->vendor; + n2 = sr->vendor; + code = SOLUTION_ALLOW_VENDORCHANGE; + } + else { + code = SOLUTION_ALLOW_REPLACEMENT; + } + } + else { + code = SOLUTION_ALLOW_REMOVE; /* s1 */ + } + + } + } + Solution *s = solution_new( $self->solver->pool, code, s1, n1, s2, n2 ); + rb_yield( SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solution, 0) ); + } + } +#endif } /*-------------------------------------------------------------*/ +/* Solution */ + +%extend Solution { + %constant int SOLUTION_UPDATE_RULE = 1; + ~Solution() + { free ($self); } + int solution() + { return $self->solution; } + Solvable *s1() + { return pool_id2solvable( $self->pool, $self->s1 ); } + const char *n1() + { return id2str( $self->pool, $self->n1 ); } + Relation *r1() + { return relation_new( $self->pool, $self->n1 ); } + Solvable *s2() + { return pool_id2solvable( $self->pool, $self->s2 ); } + const char *n2() + { return id2str( $self->pool, $self->n2 ); } +} +/*-------------------------------------------------------------*/ /* Solver */ %extend Solver { @@ -1012,8 +1184,6 @@ } } #endif - int problem_count() - { return $self->problems.count; } #if defined(SWIGRUBY) %rename("problems?") problems_found(); #endif @@ -1022,19 +1192,10 @@ #if defined(SWIGRUBY) void each_problem( Transaction *t ) { - Pool *pool = $self->pool; - Queue *transaction = &(t->queue); - Id problem = 0; while ((problem = solver_next_problem( $self, problem )) != 0) { - Id prule; - Id dep, source, target; Problem *p; - int reason; - - prule = solver_findproblemrule( $self, problem ); - reason = solver_problemruleinfo( $self, transaction, prule, &dep, &source, &target ); - p = problem_new( reason, pool_id2solvable( pool, source ), relation_new( pool, dep ), pool_id2solvable( pool, target ) ); + p = problem_new( $self, t, problem ); rb_yield( SWIG_NewPointerObj((void*) p, SWIGTYPE_p__Problem, 0) ); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8165 - in /trunk/sat-solver/bindings: ruby/tests/decisions.rb ruby/tests/problems.rb satsolver.i
by kkaempf＠svn.opensuse.org 30 Dec '07

30 Dec '07

Author: kkaempf Date: Sun Dec 30 22:11:52 2007 New Revision: 8165 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8165&view=rev Log: add Problems (to be moved to sat-solver, replacing the printXXX() functions) Added: trunk/sat-solver/bindings/ruby/tests/problems.rb Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/d… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Sun Dec 30 22:11:52 2007 @@ -7,13 +7,13 @@ def test_decision pool = SatSolver::Pool.new assert pool - pool.arch = "i686" installed = pool.create_repo( 'system' ) assert installed installed.create_solvable( 'A', '0.0-0' ) installed.create_solvable( 'B', '1.0-0' ) - installed.create_solvable( 'C', '2.0-0' ) + solv = installed.create_solvable( 'C', '2.0-0' ) + solv.requires << SatSolver::Relation.new( pool, "D", SatSolver::REL_EQ, "3.0-0" ) installed.create_solvable( 'D', '3.0-0' ) repo = pool.create_repo( 'test' ) @@ -24,12 +24,12 @@ solv1.obsoletes << SatSolver::Relation.new( pool, "C" ) solv1.requires << SatSolver::Relation.new( pool, "B", SatSolver::REL_GE, "2.0-0" ) - solv2 = repo.create_solvable( 'B', '2.0-0', 'noarch' ) + solv2 = repo.create_solvable( 'B', '2.0-0' ) assert solv2 - solv3 = repo.create_solvable( 'CC', '3.3-0', 'noarch' ) + solv3 = repo.create_solvable( 'CC', '3.3-0' ) solv3.requires << SatSolver::Relation.new( pool, "A", SatSolver::REL_GT, "0.0-0" ) - repo.create_solvable( 'DD', '4.4-0', 'noarch' ) + repo.create_solvable( 'DD', '4.4-0' ) transaction = pool.create_transaction Added: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Sun Dec 30 22:11:52 2007 @@ -0,0 +1,73 @@ +$: << "../../../build/bindings/ruby" +# test Problems +require 'test/unit' +require 'satsolver' + +class ProblemTest < Test::Unit::TestCase + def test_problems + pool = SatSolver::Pool.new + assert pool + + installed = pool.create_repo( 'system' ) + assert installed + installed.create_solvable( 'A', '0.0-0' ) + installed.create_solvable( 'B', '1.0-0' ) + solv = installed.create_solvable( 'C', '2.0-0' ) + solv.requires << SatSolver::Relation.new( pool, "D", SatSolver::REL_EQ, "3.0-0" ) + installed.create_solvable( 'D', '3.0-0' ) + + repo = pool.create_repo( 'test' ) + assert repo + + solv1 = repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv1.obsoletes << SatSolver::Relation.new( pool, "C" ) + solv1.requires << SatSolver::Relation.new( pool, "B", SatSolver::REL_GT, "2.0-0" ) + + solv2 = repo.create_solvable( 'B', '2.0-0' ) + assert solv2 + + solv3 = repo.create_solvable( 'CC', '3.3-0' ) +# solv3.requires << SatSolver::Relation.new( pool, "Z" ) + repo.create_solvable( 'DD', '4.4-0' ) + + + transaction = pool.create_transaction + transaction.install( solv1 ) + transaction.remove( "Z" ) + + solver = pool.create_solver( installed ) +# solver.allow_uninstall = 1; +# @pool.debug = 255 + solver.solve( transaction ) + puts "#{solver.problem_count} problems found" + assert solver.problem_count > 0 + i = 0 + solver.each_problem( transaction ) { |p| + i += 1 + case p.reason + when SatSolver::SOLVER_PROBLEM_UPDATE_RULE + reason = "problem with installed" + when SatSolver::SOLVER_PROBLEM_JOB_RULE + reason = "conflicting requests" + when SatSolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP + reason = "nothing provides requested" + when SatSolver::SOLVER_PROBLEM_NOT_INSTALLABLE + reason = "not installable" + when SatSolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP + reason = "nothing provides rel required by source" + when SatSolver::SOLVER_PROBLEM_SAME_NAME + reason = "cannot install both" + when SatSolver::SOLVER_PROBLEM_PACKAGE_CONFLICT + reason = "source conflicts with rel provided by target" + when SatSolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES + reason = "source obsoletes rel provided by target" + when SatSolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE + reason = "source requires rel but no providers are installable" + else + reason = "**unknown**" + end + puts "#{i}: [#{reason}] Source #{p.source}, Rel #{p.relation}, Target #{p.target}" + } + end +end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sun Dec 30 22:11:52 2007 @@ -37,7 +37,7 @@ Pool *pool; } Relation; -static Relation *relation_new( Id id, Pool *pool ) +static Relation *relation_new( Pool *pool, Id id ) { if (!id) return NULL; Relation *relation = (Relation *)malloc( sizeof( Relation )); @@ -172,8 +172,22 @@ } typedef struct _Problem { + int reason; + Solvable *source; + Relation *relation; + Solvable *target; } Problem; +static Problem *problem_new( int reason, Solvable *source, Relation *relation, Solvable *target ) +{ + Problem *p = (Problem *)malloc( sizeof( Problem )); + p->reason = reason; + p->source = source; + p->relation = relation; + p->target = target; + return p; +} + %} /*-------------------------------------------------------------*/ @@ -534,8 +548,6 @@ #define REL_WITH 18 #define REL_NAMESPACE 18 - Relation( Id id, Pool *pool) - { return relation_new( id, pool ); } %feature("autodoc", "1"); Relation( Pool *pool, const char *name, int op = 0, const char *evr = NULL ) { @@ -544,7 +556,7 @@ if (evr) evr_id = str2id( pool, evr, 1 ); Id rel = rel2id( pool, name_id, evr_id, op, 1 ); - return relation_new( rel, pool ); + return relation_new( pool, rel ); } ~Relation() { free( $self ); } @@ -627,7 +639,7 @@ if ( !*ids ) break; if ( i == 0 ) { - return relation_new( *ids, $self->solvable->repo->pool ); + return relation_new( $self->solvable->repo->pool, *ids ); } ++ids; } @@ -639,7 +651,7 @@ { Id *ids = $self->solvable->repo->idarraydata + *($self->relations); while (*ids) { - rb_yield( SWIG_NewPointerObj((void*) relation_new( *ids, $self->solvable->repo->pool ), SWIGTYPE_p__Relation, 0) ); + rb_yield( SWIG_NewPointerObj((void*) relation_new( $self->solvable->repo->pool, *ids ), SWIGTYPE_p__Relation, 0) ); ++ids; } } @@ -853,6 +865,29 @@ } /*-------------------------------------------------------------*/ +/* Problem */ + +%extend Problem { + %constant int SOLVER_PROBLEM_UPDATE_RULE = 1; + %constant int SOLVER_PROBLEM_JOB_RULE = 2; + %constant int SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP = 3; + %constant int SOLVER_PROBLEM_NOT_INSTALLABLE = 4; + %constant int SOLVER_PROBLEM_NOTHING_PROVIDES_DEP = 5; + %constant int SOLVER_PROBLEM_SAME_NAME = 6; + %constant int SOLVER_PROBLEM_PACKAGE_CONFLICT = 7; + %constant int SOLVER_PROBLEM_PACKAGE_OBSOLETES = 8; + %constant int SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE = 8; + int reason() + { return $self->reason; } + Solvable *source() + { return $self->source; } + Relation *relation() + { return $self->relation; } + Solvable *target() + { return $self->target; } +} + +/*-------------------------------------------------------------*/ /* Solver */ %extend Solver { @@ -918,7 +953,7 @@ Solvable *s, *r; int op; Decision *d; - +#if 0 if (installed) { FOR_REPO_SOLVABLES(installed, p, s) { if ($self->decisionmap[p] >= 0) @@ -932,35 +967,45 @@ rb_yield(SWIG_NewPointerObj((void*) d, SWIGTYPE_p__Decision, 0)); } } - +#endif int i; for ( i = 0; i < $self->decisionq.count; i++) { p = $self->decisionq.elements[i]; + r = NULL; if (p < 0) { /* remove */ - continue; + p = -p; + s = pool_id2solvable( pool, p ); + if (obsoletesmap[p]) { + op = DEC_OBSOLETE; + r = pool_id2solvable( pool, obsoletesmap[p] ); + } + else { + op = DEC_REMOVE; + } } else if (p == SYSTEMSOLVABLE) { continue; } - s = pool->solvables + p; - r = NULL; - if (installed && s->repo == installed) - continue; - - if (!obsoletesmap[p]) { - op = DEC_INSTALL; - } else { - op = DEC_UPDATE; - int j; - for (j = installed->start; j < installed->end; j++) { - if (obsoletesmap[j] == p) { - r = pool_id2solvable( pool, j ); - break; + s = pool->solvables + p; + if (installed && s->repo == installed) + continue; + + if (!obsoletesmap[p]) { + op = DEC_INSTALL; + } + else { + op = DEC_UPDATE; + int j; + for (j = installed->start; j < installed->end; j++) { + if (obsoletesmap[j] == p) { + r = pool_id2solvable( pool, j ); + break; + } } - } + } } d = decision_new( op, s, r ); rb_yield(SWIG_NewPointerObj((void*) d, SWIGTYPE_p__Decision, 0)); @@ -974,8 +1019,26 @@ #endif int problems_found() { return $self->problems.count != 0; } - void print_decisions() - { printdecisions( $self ); } +#if defined(SWIGRUBY) + void each_problem( Transaction *t ) + { + Pool *pool = $self->pool; + Queue *transaction = &(t->queue); + + Id problem = 0; + while ((problem = solver_next_problem( $self, problem )) != 0) { + Id prule; + Id dep, source, target; + Problem *p; + int reason; + + prule = solver_findproblemrule( $self, problem ); + reason = solver_problemruleinfo( $self, transaction, prule, &dep, &source, &target ); + p = problem_new( reason, pool_id2solvable( pool, source ), relation_new( pool, dep ), pool_id2solvable( pool, target ) ); + rb_yield( SWIG_NewPointerObj((void*) p, SWIGTYPE_p__Problem, 0) ); + } + } +#endif #if defined(SWIGRUBY) void each_to_install() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8164 - /trunk/sat-solver/src/solver.c
by kkaempf＠svn.opensuse.org 30 Dec '07

30 Dec '07

Author: kkaempf Date: Sun Dec 30 21:22:21 2007 New Revision: 8164 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8164&view=rev Log: negate p before use as offset Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=8164… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Sun Dec 30 21:22:21 2007 @@ -2731,6 +2731,7 @@ { IF_POOLDEBUG (SAT_DEBUG_SCHUBI) { + p = -p; s = pool->solvables + p; POOL_DEBUG(SAT_DEBUG_SCHUBI, "level of %s is %d\n", solvable2str(pool, s), p); } @@ -2740,7 +2741,7 @@ { POOL_DEBUG(SAT_DEBUG_SCHUBI, "SYSTEMSOLVABLE\n"); continue; - } + } s = pool->solvables + p; if (installed && s->repo == installed) continue; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8163 - in /trunk/sat-solver: bindings/ruby/tests/decisions.rb bindings/satsolver.i src/solver.c src/solver.h
by kkaempf＠svn.opensuse.org 30 Dec '07

30 Dec '07

Author: kkaempf Date: Sun Dec 30 17:58:01 2007 New Revision: 8163 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8163&view=rev Log: add Decision (solver result element) and testcase Added: trunk/sat-solver/bindings/ruby/tests/decisions.rb Modified: trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Added: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/d… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Sun Dec 30 17:58:01 2007 @@ -0,0 +1,62 @@ +$: << "../../../build/bindings/ruby" +# test Decisions +require 'test/unit' +require 'satsolver' + +class DecisionTest < Test::Unit::TestCase + def test_decision + pool = SatSolver::Pool.new + assert pool + pool.arch = "i686" + + installed = pool.create_repo( 'system' ) + assert installed + installed.create_solvable( 'A', '0.0-0' ) + installed.create_solvable( 'B', '1.0-0' ) + installed.create_solvable( 'C', '2.0-0' ) + installed.create_solvable( 'D', '3.0-0' ) + + repo = pool.create_repo( 'test' ) + assert repo + + solv1 = repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv1.obsoletes << SatSolver::Relation.new( pool, "C" ) + solv1.requires << SatSolver::Relation.new( pool, "B", SatSolver::REL_GE, "2.0-0" ) + + solv2 = repo.create_solvable( 'B', '2.0-0', 'noarch' ) + assert solv2 + + solv3 = repo.create_solvable( 'CC', '3.3-0', 'noarch' ) + solv3.requires << SatSolver::Relation.new( pool, "A", SatSolver::REL_GT, "0.0-0" ) + repo.create_solvable( 'DD', '4.4-0', 'noarch' ) + + + transaction = pool.create_transaction + transaction.install( solv3 ) + transaction.remove( "D" ) + + solver = pool.create_solver( installed ) + solver.allow_uninstall = 1; +# @pool.debug = 255 + solver.solve( transaction ) + puts "#{solver.problem_count} problems found" + assert solver.decision_count > 0 + i = 0 + solver.each_decision { |d| + i += 1 + case d.op + when SatSolver::DEC_INSTALL + puts "#{i}: Install #{d.solvable} #{d.reason}" + when SatSolver::DEC_REMOVE + puts "#{i}: Remove #{d.solvable} #{d.reason}" + when SatSolver::DEC_OBSOLETE + puts "#{i}: Obsolete #{d.solvable} #{d.reason}" + when SatSolver::DEC_UPDATE + puts "#{i}: Update #{d.solvable} #{d.reason}" + else + puts "#{i}: Decision op #{d.op}" + end + } + end +end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sun Dec 30 17:58:01 2007 @@ -151,6 +151,29 @@ free( t ); } +#define DEC_INSTALL 1 +#define DEC_REMOVE 2 +#define DEC_UPDATE 3 +#define DEC_OBSOLETE 4 + +typedef struct _Decision { + int op; /* DEC_{INSTALL,UPDATE,OBSOLETE,REMOVE} */ + Solvable *solvable; + Solvable *reason; +} Decision; + +static Decision *decision_new( int op, Solvable *solvable, Solvable *reason ) +{ + Decision *d = (Decision *)malloc( sizeof( Decision )); + d->op = op; + d->solvable = solvable; + d->reason = reason; + return d; +} + +typedef struct _Problem { +} Problem; + %} /*-------------------------------------------------------------*/ @@ -199,6 +222,14 @@ %rename(Solver) solver; typedef struct solver {} Solver; +%nodefault _Decision; +%rename(Decision) _Decision; +typedef struct _Decision {} Decision; + +%nodefault _Problem; +%rename(Problem) _Problem; +typedef struct _Problem {} Problem; + /*-------------------------------------------------------------*/ /* Pool */ @@ -801,6 +832,27 @@ } /*-------------------------------------------------------------*/ +/* Decision */ + +%extend Decision { + %constant int DEC_INSTALL = 1; + %constant int DEC_REMOVE = 2; + %constant int DEC_UPDATE = 3; + %constant int DEC_OBSOLETE = 4; + + Decision( int op, Solvable *solvable, Solvable *reason = NULL ) + { return decision_new( op, solvable, reason ); } + ~Decision() + { free( $self ); } + int op() + { return $self->op; } + Solvable *solvable() + { return $self->solvable; } + Solvable *reason() + { return $self->reason; } +} + +/*-------------------------------------------------------------*/ /* Solver */ %extend Solver { @@ -855,6 +907,73 @@ void solve( Transaction *t ) { solver_solve( $self, &(t->queue)); } + int decision_count() + { return $self->decisionq.count; } +#if defined(SWIGRUBY) + void each_decision() + { + Pool *pool = $self->pool; + Repo *installed = $self->installed; + Id p, *obsoletesmap = create_obsoletesmap( $self ); + Solvable *s, *r; + int op; + Decision *d; + + if (installed) { + FOR_REPO_SOLVABLES(installed, p, s) { + if ($self->decisionmap[p] >= 0) + continue; + if (obsoletesmap[p]) { + d = decision_new( DEC_OBSOLETE, s, pool_id2solvable( pool, obsoletesmap[p] ) ); + } + else { + d = decision_new( DEC_REMOVE, s, NULL ); + } + rb_yield(SWIG_NewPointerObj((void*) d, SWIGTYPE_p__Decision, 0)); + } + } + + int i; + for ( i = 0; i < $self->decisionq.count; i++) + { + p = $self->decisionq.elements[i]; + + if (p < 0) { /* remove */ + continue; + } + else if (p == SYSTEMSOLVABLE) { + continue; + } + s = pool->solvables + p; + r = NULL; + if (installed && s->repo == installed) + continue; + + if (!obsoletesmap[p]) { + op = DEC_INSTALL; + } + else { + op = DEC_UPDATE; + int j; + for (j = installed->start; j < installed->end; j++) { + if (obsoletesmap[j] == p) { + r = pool_id2solvable( pool, j ); + break; + } + } + } + d = decision_new( op, s, r ); + rb_yield(SWIG_NewPointerObj((void*) d, SWIGTYPE_p__Decision, 0)); + } + } +#endif + int problem_count() + { return $self->problems.count; } +#if defined(SWIGRUBY) + %rename("problems?") problems_found(); +#endif + int problems_found() + { return $self->problems.count != 0; } void print_decisions() { printdecisions( $self ); } @@ -896,6 +1015,17 @@ rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); } } + + void each_suggested() + { + int i; + Solvable *s; + for (i = 0; i < $self->suggestions.count; i++) { + s = $self->pool->solvables + $self->suggestions.elements[i]; + rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); + } + } + #endif }; Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=8163… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Sun Dec 30 17:58:01 2007 @@ -2622,23 +2622,20 @@ } - /* - * printdecisions + * create obsoletesmap from solver decisions + * required for decision handling */ - -void -printdecisions(Solver *solv) +Id * +create_obsoletesmap(Solver *solv) { Pool *pool = solv->pool; Repo *installed = solv->installed; - Id p, *obsoletesmap; + Id p, *obsoletesmap = NULL; int i; Solvable *s; - POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions -----\n"); - obsoletesmap = (Id *)xcalloc(pool->nsolvables, sizeof(Id)); if (installed) { @@ -2691,6 +2688,24 @@ } } } + return obsoletesmap; +} + +/* + * printdecisions + */ + + +void +printdecisions(Solver *solv) +{ + Pool *pool = solv->pool; + Repo *installed = solv->installed; + Id p, *obsoletesmap = create_obsoletesmap( solv ); + int i; + Solvable *s; + + POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- Decisions -----\n"); /* print solvables to be erased */ Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=8163… ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Sun Dec 30 17:58:01 2007 @@ -145,6 +145,8 @@ extern Id solver_findproblemrule(Solver *solv, Id problem); extern SolverProbleminfo solver_problemruleinfo(Solver *solv, Queue *job, Id rid, Id *depp, Id *sourcep, Id *targetp); +Id *create_obsoletesmap(Solver *solv); + /* debug functions, do not use */ void printdecisions(Solver *solv); void printsolutions(Solver *solv, Queue *job); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8162 - in /trunk/sat-solver/bindings: ruby/tests/solvable.rb satsolver.i
by kkaempf＠svn.opensuse.org 30 Dec '07

30 Dec '07

Author: kkaempf Date: Sun Dec 30 11:00:52 2007 New Revision: 8162 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8162&view=rev Log: fix dependency creation (they're never standalone but 'backpointer' to solvable->{provides,requires, ...) fix solvable.add_dependency auto-add self-provides when creating a solvable Its now possible to generate repos, solvables and relations through the bindings. No need for .solv files. Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Sun Dec 30 11:00:52 2007 @@ -35,6 +35,7 @@ puts "#{solv.id}: #{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" end def test_deps + return @pool.each { |s| puts s show_dep "Provides", s.provides @@ -43,4 +44,40 @@ show_dep "Conflicts", s.conflicts } end + def test_creation + repo = @pool.create_repo( 'test' ) + assert repo + solv1 = repo.create_solvable( 'one', '1.0-0' ) + assert solv1 + assert repo.size == 1 + assert solv1.name == 'one' + assert solv1.evr == "1.0-0" + assert solv1.vendor.nil? + solv2 = SatSolver::Solvable.new( repo, 'two', '2.0-0', 'noarch' ) + assert solv2 + assert repo.size == 2 + assert solv2.name == 'two' + assert solv2.evr == "2.0-0" + solv2.vendor = "Ruby" + assert solv2.vendor == "Ruby" + + rel = SatSolver::Relation.new( @pool, "two", SatSolver::REL_GE, "2.0-0" ) + assert rel + solv1.requires << rel + assert solv1.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv1 ) + + solver = @pool.create_solver( @pool.create_repo( "system" ) ) +# @pool.debug = 255 + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + end end Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Sun Dec 30 11:00:52 2007 @@ -22,6 +22,16 @@ #include "repo_solv.h" #include "repo_rpmdb.h" +static const char * +my_id2str( Pool *pool, Id id ) +{ + if (id == STRID_NULL) + return NULL; + if (id == STRID_EMPTY) + return ""; + return id2str( pool, id ); +} + typedef struct _Relation { Offset id; Pool *pool; @@ -38,16 +48,42 @@ /* Collection of Relations -> Dependency */ typedef struct _Dependency { - Offset relation; /* offset into repo->idarraydata */ + Offset *relations; /* ptr to solvable deps (requires, provides, ...) + (offset into repo->idarraydata) */ Solvable *solvable; /* solvable this dep belongs to */ } Dependency; -static Dependency *dependency_new( Offset relation, Solvable *solvable ) +#define DEP_PRV 1 +#define DEP_REQ 2 +#define DEP_CON 3 +#define DEP_OBS 4 +#define DEP_REC 5 +#define DEP_SUG 6 +#define DEP_SUP 7 +#define DEP_ENH 8 + +static Dependency *dependency_new( Solvable *solvable, Offset *relations, int dep ) { - if (!relation) return NULL; Dependency *dependency = (Dependency *)malloc( sizeof( Dependency )); - dependency->relation = relation; dependency->solvable = solvable; + if (relations) { + dependency->relations = relations; + } + else { + switch( dep ) { + case DEP_PRV: dependency->relations = &(solvable->provides); break; + case DEP_REQ: dependency->relations = &(solvable->requires); break; + case DEP_CON: dependency->relations = &(solvable->conflicts); break; + case DEP_OBS: dependency->relations = &(solvable->obsoletes); break; + case DEP_REC: dependency->relations = &(solvable->recommends); break; + case DEP_SUG: dependency->relations = &(solvable->suggests); break; + case DEP_SUP: dependency->relations = &(solvable->supplements); break; + case DEP_ENH: dependency->relations = &(solvable->enhances); break; + default: + /* FIXME: raise exception */ + return NULL; + } + } return dependency; } @@ -55,14 +91,34 @@ { if (!dep) return 0; int i = 0; - if (dep->relation) { - Id *ids = dep->solvable->repo->idarraydata + dep->relation; + if (dep->relations) { + Id *ids = dep->solvable->repo->idarraydata + *(dep->relations); while (*ids++) ++i; } return i; } + +Solvable *solvable_new( Repo *repo, const char *name, const char *evr, const char *arch ) +{ + Solvable *s = pool_id2solvable( repo->pool, repo_add_solvable( repo ) ); + Id nameid = str2id( repo->pool, name, 1 ); + Id evrid = str2id( repo->pool, evr, 1 ); + if (arch == NULL) arch = "noarch"; + Id archid = str2id( repo->pool, arch, 1 ); + s->name = nameid; + s->evr = evrid; + s->arch = archid; + + /* add self-provides */ + Id rel = rel2id( repo->pool, nameid, evrid, REL_EQ, 1 ); + s->provides = repo_addid_dep( repo, s->provides, rel, 0 ); + + return s; +} + + typedef struct _Action { SolverCmd cmd; Id id; @@ -190,13 +246,13 @@ /* * Name management */ - Id intern( const char *name ) + Id str2id( const char *name ) { return str2id( $self, name, 1 ); } - const char *idname( Id id ) + const char *id2str( Id id ) { - return id2str( $self, id ); + return my_id2str( $self, id ); } /* @@ -361,8 +417,15 @@ %extend Repo { Repo( Pool *pool, const char *reponame ) { return repo_create( pool, reponame ); } + int size() { return $self->nsolvables; } +#if defined(SWIGRUBY) + %rename("empty?") empty(); +#endif + int empty() + { return $self->nsolvables == 0; } + const char *name() { return $self->name; } #if defined(SWIGRUBY) @@ -395,6 +458,8 @@ void add_rpmdb( const char *rootdir ) { repo_add_rpmdb( $self, NULL, rootdir ); } + Solvable *create_solvable( const char *name, const char *evr, const char *arch = NULL ) + { return solvable_new( $self, name, evr, arch ); } #if defined(SWIGRUBY) void each() @@ -426,13 +491,18 @@ /* Relation */ %extend Relation { - %constant int REL_GT = 1; - %constant int REL_EQ = 2; - %constant int REL_LT = 4; - %constant int REL_AND = 16; - %constant int REL_OR = 17; - %constant int REL_WITH = 18; - %constant int REL_NAMESPACE = 18; +/* operation */ +#define REL_GT 1 +#define REL_EQ 2 +#define REL_GE 3 +#define REL_LT 4 +#define REL_NE 5 +#define REL_LE 6 +#define REL_AND 16 +#define REL_OR 17 +#define REL_WITH 18 +#define REL_NAMESPACE 18 + Relation( Id id, Pool *pool) { return relation_new( id, pool ); } %feature("autodoc", "1"); @@ -455,12 +525,12 @@ const char *name() { Reldep *rd = GETRELDEP( $self->pool, $self->id ); - return id2str( $self->pool, rd->name ); + return my_id2str( $self->pool, rd->name ); } const char *evr() { Reldep *rd = GETRELDEP( $self->pool, $self->id ); - return id2str( $self->pool, rd->evr ); + return my_id2str( $self->pool, rd->evr ); } int op() { @@ -483,10 +553,20 @@ /* Dependency */ %extend Dependency { - Dependency( Offset offset, Solvable *solvable ) - { return dependency_new( offset, solvable ); } +#define DEP_PRV 1 +#define DEP_REQ 2 +#define DEP_CON 3 +#define DEP_OBS 4 +#define DEP_REC 5 +#define DEP_SUG 6 +#define DEP_SUP 7 +#define DEP_ENH 8 + + Dependency( Solvable *solvable, int dep ) + { return dependency_new( solvable, NULL, dep ); } ~Dependency() { free( $self ); } + int size() { return dependency_size( $self ); } #if defined(SWIGRUBY) @@ -494,6 +574,15 @@ #endif int empty() { return dependency_size( $self ) == 0; } + +#if defined(SWIGRUBY) + %alias add_relation "<<"; +#endif + Dependency *add_relation( Relation *rel, int pre = 0 ) + { + *($self->relations) = repo_addid_dep( $self->solvable->repo, *($self->relations), rel->id, pre ? SOLVABLE_PREREQMARKER : 0 ); + return $self; + } #if defined(SWIGRUBY) /* %rename is rejected by swig for [] */ @@ -501,17 +590,15 @@ #endif Relation *get_relation( int i ) { - if ($self->relation) { - /* loop over it to detect end */ - Id *ids = $self->solvable->repo->idarraydata + $self->relation; - while ( i-- >= 0 ) { - if ( !*ids ) - break; - if ( i == 0 ) { - return relation_new( *ids, $self->solvable->repo->pool ); - } - ++ids; + /* loop over it to detect end */ + Id *ids = $self->solvable->repo->idarraydata + *($self->relations); + while ( i-- >= 0 ) { + if ( !*ids ) + break; + if ( i == 0 ) { + return relation_new( *ids, $self->solvable->repo->pool ); } + ++ids; } return NULL; } @@ -519,34 +606,22 @@ #if defined(SWIGRUBY) void each() { - if ($self->relation) { - Id *ids = $self->solvable->repo->idarraydata + $self->relation; - while (*ids) { - rb_yield( SWIG_NewPointerObj((void*) relation_new( *ids, $self->solvable->repo->pool ), SWIGTYPE_p__Relation, 0) ); - ++ids; - } + Id *ids = $self->solvable->repo->idarraydata + *($self->relations); + while (*ids) { + rb_yield( SWIG_NewPointerObj((void*) relation_new( *ids, $self->solvable->repo->pool ), SWIGTYPE_p__Relation, 0) ); + ++ids; } } #endif -#if defined(SWIGRUBY) - /* %rename is rejected by swig for [] */ - %alias get_relation "[]"; -#endif - Relation *get_relation( unsigned int i ) - { - if (!$self->relation) - return NULL; - /* FIXME: check overflow */ - Id *ids = $self->solvable->repo->idarraydata + $self->relation + i; - return relation_new( *ids, $self->solvable->repo->pool ); - } } /*-------------------------------------------------------------*/ /* Solvable */ %extend Solvable { + Solvable( Repo *repo, const char *name, const char *evr, const char *arch = NULL ) + { return solvable_new( repo, name, evr, arch ); } Id id() { if (!$self->repo) @@ -554,20 +629,26 @@ return $self - $self->repo->pool->solvables; } - const char * name() - { return id2str( $self->repo->pool, $self->name ); } + const char *name() + { return my_id2str( $self->repo->pool, $self->name ); } Id name_id() { return $self->name; } - const char * arch() - { return id2str( $self->repo->pool, $self->arch ); } + const char *arch() + { return my_id2str( $self->repo->pool, $self->arch ); } Id arch_id() { return $self->arch; } - const char * evr() - { return id2str( $self->repo->pool, $self->evr ); } + const char *evr() + { return my_id2str( $self->repo->pool, $self->evr ); } Id evr_id() { return $self->evr; } - const char * vendor() - { return id2str( $self->repo->pool, $self->vendor ); } + + const char *vendor() + { return my_id2str( $self->repo->pool, $self->vendor ); } +#if defined(SWIGRUBY) + %rename( "vendor=" ) set_vendor( const char *vendor ); +#endif + void set_vendor(const char *vendor) + { $self->vendor = str2id( $self->repo->pool, vendor, 1 ); } Id vendor_id() { return $self->vendor; } @@ -583,21 +664,21 @@ * Dependencies */ Dependency *provides() - { return dependency_new( $self->provides, $self ); } + { return dependency_new( $self, &(self->provides), 0 ); } Dependency *requires() - { return dependency_new( $self->requires, $self ); } + { return dependency_new( $self, &(self->requires), 0 ); } Dependency *conflicts() - { return dependency_new( $self->conflicts, $self ); } + { return dependency_new( $self, &(self->conflicts), 0 ); } Dependency *obsoletes() - { return dependency_new( $self->obsoletes, $self ); } + { return dependency_new( $self, &(self->obsoletes), 0 ); } Dependency *recommends() - { return dependency_new( $self->recommends, $self ); } + { return dependency_new( $self, &(self->recommends), 0 ); } Dependency *suggests() - { return dependency_new( $self->suggests, $self ); } + { return dependency_new( $self, &(self->suggests), 0 ); } Dependency *supplements() - { return dependency_new( $self->supplements, $self ); } + { return dependency_new( $self, &(self->supplements), 0 ); } Dependency *enhances() - { return dependency_new( $self->enhances, $self ); } + { return dependency_new( $self, &(self->enhances), 0 ); } } /*-------------------------------------------------------------*/ @@ -818,38 +899,3 @@ #endif }; - -#if 0 - -%include "repo.h" -%include "repo_solv.h" - -%nodefaultdtor Repo; -%extend Repo { - - /* const char *name() { return repo_name($self); } */ - - void each_solvable() - { - Id p; - Solvable *s; - FOR_REPO_SOLVABLES($self, p, s) - { - rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); - } - } - - Solvable *add_solvable() - { - return pool_id2solvable($self->pool, repo_add_solvable($self)); - } - - void add_solv(FILE *fp) - { - repo_add_solv($self, fp); - } -}; - -%include "repo_solv.h" - -#endif \ No newline at end of file -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8161 - /trunk/sat-solver/bindings/python/CMakeLists.txt
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 22:32:25 2007 New Revision: 8161 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8161&view=rev Log: add comments Modified: trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Fri Dec 28 22:32:25 2007 @@ -1,3 +1,12 @@ +# +# cmake description for satsolver Python bindings +# +# !!Attn!!: This creates two files +# 1. _satsolverx.so +# 2. satsolverx.py +# and the .py file gets imported. See bindings/python/tests. +# + ADD_SUBDIRECTORY(tests) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 'import sys; print sys.path[2]' OUTPUT_VARIABLE PYTHON_LIB_DIR) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8160 - in /trunk/sat-solver/bindings: CMakeLists.txt python/CMakeLists.txt python/tests/ python/tests/loading.py ruby/CMakeLists.txt satsolver.i
by kkaempf＠svn.opensuse.org 28 Dec '07

28 Dec '07

Author: kkaempf Date: Fri Dec 28 22:30:12 2007 New Revision: 8160 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8160&view=rev Log: Add Python bindings - all 'each' functions in satsolver.i are Ruby only - add indexed accessor functions as needed - add loading test for Python Added: trunk/sat-solver/bindings/python/tests/ trunk/sat-solver/bindings/python/tests/loading.py Modified: trunk/sat-solver/bindings/CMakeLists.txt trunk/sat-solver/bindings/python/CMakeLists.txt trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/CMakeLists.t… ============================================================================== --- trunk/sat-solver/bindings/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/CMakeLists.txt Fri Dec 28 22:30:12 2007 @@ -1,10 +1,11 @@ +FIND_PACKAGE(SWIG) FIND_PACKAGE(Ruby) -#FIND_PACKAGE(Python) +FIND_PACKAGE(PythonLibs) IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ADD_SUBDIRECTORY(ruby) ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) -#IF (PYTHON_LIBRARY) -# ADD_SUBDIRECTORY(python) -#ENDIF(PYTHON_LIBRARY) +IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) +ENDIF(PYTHON_LIBRARY) Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Fri Dec 28 22:30:12 2007 @@ -1,11 +1,10 @@ ADD_SUBDIRECTORY(tests) -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/tools") - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 'import sys; print sys.path[2]' OUTPUT_VARIABLE PYTHON_LIB_DIR) MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") +MESSAGE(STATUS "Python site dir: ${PYTHON_LIB_DIR}/site-packages") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/satsolver.i" ) @@ -13,7 +12,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." - COMMAND ${SWIG_EXECUTABLE} -python -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i + COMMAND ${SWIG_EXECUTABLE} -python -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i @@ -23,15 +22,17 @@ DEPENDS ${SWIG_OUTPUT} ) -SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) -ADD_LIBRARY( satsolverx SHARED "${satsolverx_SRCS}" ) -SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) -ADD_DEPENDENCIES( satsolverx glue ) - -#INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) -TARGET_LINK_LIBRARIES( satsolverx satsolver ) -TARGET_LINK_LIBRARIES( satsolverx ${PYTHON_LIBRARY} ) - -INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${PYTHON_LIB_DIR}/site-packages) -CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.py ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py COPYONLY ) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py DESTINATION ${PYTHON_LIB_DIR}/site-packages ) +SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +ADD_LIBRARY( _satsolverx SHARED ${satsolverx_SRCS} ) +SET_TARGET_PROPERTIES( _satsolverx PROPERTIES PREFIX "" ) +ADD_DEPENDENCIES( _satsolverx glue ) + +INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) + +TARGET_LINK_LIBRARIES( _satsolverx satsolver ) +TARGET_LINK_LIBRARIES( _satsolverx ${PYTHON_LIBRARIES} ) +TARGET_LINK_LIBRARIES( _satsolverx ${DB43_LIBRARY} ) + +INSTALL(TARGETS _satsolverx LIBRARY DESTINATION ${PYTHON_LIB_DIR}/site-packages) + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolverx.py DESTINATION ${PYTHON_LIB_DIR}/site-packages ) Added: trunk/sat-solver/bindings/python/tests/loading.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/loading.py (added) +++ trunk/sat-solver/bindings/python/tests/loading.py Fri Dec 28 22:30:12 2007 @@ -0,0 +1,3 @@ +import sys +sys.path.append('../../../build/bindings/python') +import satsolverx \ No newline at end of file Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Fri Dec 28 22:30:12 2007 @@ -11,7 +11,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c - COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for ruby..." + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." COMMAND ${SWIG_EXECUTABLE} -ruby -autorename -o ${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c -I${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../satsolver.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -22,12 +22,13 @@ DEPENDS ${SWIG_OUTPUT} ) -SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) +SET(satsolverx_SRCS "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" "${CMAKE_SOURCE_DIR}/tools/repo_rpmdb.c" ) ADD_LIBRARY( satsolverx SHARED ${satsolverx_SRCS} ) SET_TARGET_PROPERTIES( satsolverx PROPERTIES PREFIX "" ) ADD_DEPENDENCIES( satsolverx glue ) INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/tools ) + TARGET_LINK_LIBRARIES( satsolverx satsolver ) TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) TARGET_LINK_LIBRARIES( satsolverx ${DB43_LIBRARY} ) Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Fri Dec 28 22:30:12 2007 @@ -2,8 +2,10 @@ %{ +#if defined(SWIGRUBY) #include "ruby.h" #include "rubyio.h" +#endif #include "policy.h" #include "bitmap.h" #include "evr.h" @@ -694,6 +696,17 @@ void clear() { queue_empty( &($self->queue) ); } + Action *get_action( unsigned int i ) + { + i <<= 1; + int size = $self->queue.count; + if (i-1 >= size) return NULL; + int cmd = $self->queue.elements[i]; + Id id = $self->queue.elements[i+1]; + return action_new( cmd, id ); + } + +#if defined(SWIGRUBY) void each() { int i; @@ -703,7 +716,7 @@ rb_yield(SWIG_NewPointerObj((void*) action_new( cmd, id ), SWIGTYPE_p__Action, 0)); } } - +#endif } /*-------------------------------------------------------------*/ @@ -764,6 +777,7 @@ void print_decisions() { printdecisions( $self ); } +#if defined(SWIGRUBY) void each_to_install() { Id p; @@ -801,6 +815,7 @@ rb_yield(SWIG_NewPointerObj((void*) s, SWIGTYPE_p__Solvable, 0)); } } +#endif }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0