1
0
Fork 0
Commit Graph

168 Commits (fdcae616b0bdf57b1460491badb4501906a83044)

Author SHA1 Message Date
Nils Adermann 83123b2d40 Generate human readable explanations of rules which cause problems 2012-03-18 21:09:26 +01:00
Nils Adermann 2c87fe5a22 Collect solver problems in Problem objects with human readable output. 2012-03-18 20:41:10 +01:00
Jordi Boggiano 9ed05e09f3 Fix version_compare for ubuntu that ships with versions like 5.3.3-1 (bigger than 5.3.3) 2012-03-16 16:07:48 +01:00
Nils Adermann 17f0730e51 Levels are always > 0, negative level was just a hack in the C implementation
Fixes #243
2012-02-22 16:20:08 +01:00
Nils Adermann f3ff53b17c Create problems directly, rather than generating impossible rules 2012-02-20 12:58:27 +01:00
Nils Adermann ff620afe05 Correct the parent path in the watch tree, after moving a rule out of the path 2012-02-19 19:20:12 +01:00
Nils Adermann 3e1749fbad Readd update-all jobs and make them available through the request 2012-02-19 16:59:04 +01:00
Nils Adermann 9b8e62396c Merge pull request #324 from edorian/installNonExistingPackage
Create an 'impossible rule' when installing non existent packages
2012-02-19 07:05:21 -08:00
Nils Adermann 2a92b904d2 Correct placing of braces 2012-02-19 15:44:02 +01:00
Nils Adermann 1ee5d99405 When changing watched literals of a rule, update the parent's next pointer
The previous rule was not previously updated to point to the next rule when
removing a middle rule from the watch tree for a literal. This resulted in
jumping from one literal's watch tree to another's, which could then jump
back to the original and cause infinite loop in a case like #265.

Fixes #265
2012-02-19 15:35:13 +01:00
Volker Dusch e20a79ac61 Fix TODO tags to confirm with the projects standard 2012-02-19 15:30:53 +01:00
Nils Adermann 8484199677 Display undecided literals as undecided with a ?, when printing the decision map 2012-02-19 15:20:13 +01:00
Nils Adermann 0b8fb68e93 Add a debug print method for the entire watch tree to the solver 2012-02-19 15:19:34 +01:00
Volker Dusch eafe13d5a5 Create an impossible rule when trying to install something that doesn't exist.
The rule isn't acted upon yet (hence the incomplete test) but it is there as a reminder that this case needs to be handled.
2012-02-19 14:55:14 +01:00
Nils Adermann 52d876e11e Add SolverProblemsException and test basic solver failures 2012-02-19 00:15:23 +01:00
Nils Adermann 8fd4e56029 Deciding to install a package and wanting to install it, is not a conflict 2012-02-19 00:13:21 +01:00
Volker Dusch 3fb75faa75 Now that no more update rules are created the code that handles them can be removed too.
Also adapted the tests that used TYPE_UPDATE exemplarily to use TYPE_FEATURE.
2012-02-18 19:19:49 +01:00
Volker Dusch ec61297122 Remove the allowUninstall policy option and clean up the only usage 2012-02-18 18:31:19 +01:00
Nils Adermann cbc021c05d featureRule no longer exists, only update rule 2012-02-18 18:04:45 +01:00
Volker Dusch 5fdca19880 Removed the option to disallowed downgrades and simplifed some places where it was used 2012-02-18 17:50:15 +01:00
Volker Dusch cc80e5a3b1 Cleanup unreachable code 2012-02-18 14:29:58 +01:00
Volker Dusch fb69ef64c5 Fix Solver function visibility to reflect what acutally should be the public interface 2012-02-18 12:44:52 +01:00
Nils Adermann cb7f656fa9 Off by one error in the solver - 1 cannot be false
Fixes #133, #160, #162, #177, #289
2012-02-18 00:11:08 +01:00
Justin Rainbow 8e64229461 Increasing version number to include 5.3.3 which also has an issue with SplFixedArray 2012-02-01 09:31:27 -07:00
Joseph Bielawski 188d8beb79 Class name typo fix 2012-01-19 16:58:59 +01:00
Justin Rainbow 7eda0a8823 PHP 5.3.2 segmentation fault fix
For some reason, using the SqlFixedArray causes a Segmentation Fault during
an install or update.  Changing to a simple array fixes this issue, but in
turn uses more memory.  Which is why there is the version test.
2012-01-18 15:56:29 -07:00
Jordi Boggiano edf948454b Remove IO from Solver, debug methods don't need it 2012-01-17 22:46:52 +01:00
François Pluchino 0f9dcc9618 Remplace all echo with writeln method of IO 2012-01-16 20:44:06 +01:00
Hugo Hamon 9acbb0c026 [DependencyResolver] removed unused local variables and fixed some wrong local variable names in Solver class. 2012-01-11 09:11:27 +01:00
digitalkaoz 87831d8c1c fixed typo 2011-12-06 21:13:04 +01:00
Jordi Boggiano d020f2701d Merge pull request #118 from naderman/priority-replace-any-version
Replaced packages have higher priority even if wrong version is replaced
2011-11-21 08:30:40 -08:00
Nils Adermann 40b33914b3 Compute rule hashes for faster duplicate detection 2011-11-21 16:04:33 +01:00
Nils Adermann bca746c947 Don't consider a revert to level 1 (base level) in sat solver a failure 2011-11-21 15:02:42 +01:00
Nils Adermann 4140f08d9c Use a map of installed package ids in the solver
The assumption package.repo == installed no longer holds for installed
packages because there are multiple wrapped installed repositories.
2011-11-19 00:27:35 +01:00
Nils Adermann e4f40272a3 Conflict handling: lastWeakWhy stores a rule, not a rule id 2011-10-29 20:05:06 +02:00
Nils Adermann 3e0e893f26 Correctly output decision map when debugging 2011-10-29 20:04:52 +02:00
Nils Adermann 85d38c653f Also detect updates resulting from feature rules rather than update rules 2011-10-29 19:39:18 +02:00
Jordi Boggiano d3aa8336dc Fix typo 2011-10-29 19:21:34 +02:00
Nils Adermann e4c94dd415 Adding tests for the default policy specifying its desired behaviour 2011-10-21 14:44:24 +02:00
Jordi Boggiano 5623f3e69c Fix refactoring bugs 2011-09-25 23:07:42 +02:00
everzet 0a1e7320b0 Refactored solver result array. Now it returns array of operation objects which are much nicer to work with 2011-09-24 02:29:22 +03:00
pborreli f7735c396f [Composer] Fixed typos 2011-09-15 01:22:33 +00:00
Nils Adermann 4dbb73daba Use an SplFixedArray for the solver's decision map 2011-08-21 07:30:10 -04:00
Nils Adermann 69ebbf0eac Correct handling of rules with more than 2 literals. 2011-08-21 06:30:06 -04:00
Nils Adermann 6118c00086 Implement minimization of branches 2011-08-20 23:03:52 -04:00
Nils Adermann 0f6fb9b692 Separate transaction generation from solving and properly identify updates 2011-08-20 18:38:31 -04:00
Nils Adermann f46aa495da Turn obsolete relationships and replaced packages into conflict rules 2011-08-20 18:19:47 -04:00
Nils Adermann 52565a5935 Implement handling of conflicts with learned rules 2011-08-20 13:45:20 -04:00
Nils Adermann b0c685176b Correct branch handling and implement reverting of decisions at a particular level 2011-08-20 13:36:18 -04:00
Nils Adermann 37e676cedd Implement analysis of conflicting rules 2011-08-20 13:21:24 -04:00
Nils Adermann 6d157b325d Package ids are always positive, so use absolute literal value for package id 2011-08-20 13:21:24 -04:00
Nils Adermann ad25618bdd Add install job and update rule conflict handling and reenable installation 2011-08-19 06:15:51 -04:00
Nils Adermann 1125de6bf2 Added disablePolicyRules to solve conflicts between remove jobs & update rules
This temporarily breaks installation of packages
2011-08-19 06:06:00 -04:00
Nils Adermann 61ad71b624 Reverse the transaction instruction order.
Early decisions cause later ones through dependencies. So in order to
perform the earlier decisions the later ones must be fulfilled first.
2011-08-05 04:14:11 -04:00
Nils Adermann 825deff09f Completed analysis of unsolvable situations and main decision process 2011-07-08 07:11:04 -04:00
Nils Adermann bc672deb32 Moving rule iteration logic to a separate RuleSet and RuleSetIterator class 2011-06-27 00:11:57 +02:00
Nils Adermann 498125adbe Assertions are now properly decided before running the main solver.
Updating does not work yet. The test case works fine for installing/removing
the correct packages however. Weak (update/feature) rules are entirely ignored
so far.

Watches are on literal ids rather than literals to save on function calls
and memory usage. So a few methods for literals now have an id counter part.
This should probably be refactored to have the literal versions call the
id ones instead.
2011-06-07 22:43:26 +02:00
Nils Adermann 2e41993822 Update solver to use PackageInterface and store pool package ids inside of packages 2011-06-03 18:27:44 +02:00
Nils Adermann 8cbf3f4d75 No need to unify rules, we already check for duplication on insertion 2011-06-03 18:03:12 +02:00
Jordi Boggiano a67a1637e1 Print more human-readable info 2011-05-23 02:00:03 +02:00
Jordi Boggiano 831f5219b6 Use spl_object_hash() instead of the package id which doesn't exist anymore 2011-05-23 02:00:00 +02:00
Jordi Boggiano b85c1a2780 Fix interfaces use statements/use interfaces for type hints 2011-05-23 01:59:57 +02:00
Nils Adermann 273e12e386 Rule unification 2011-05-22 19:40:52 +02:00
Nils Adermann f3d9c8701a Generate transaction from solver's final decision queue. 2011-05-22 19:40:41 +02:00
Nils Adermann 8c9f8fb86f Rename RelationConstraints to Links in the Package namespace.
Constraints have been generalised to allow matching requiring and providing
constraints against each other.
2011-04-18 00:27:31 +02:00
Jordi Boggiano 6dbec8718d Remove contains() from RepositoryInterface 2011-04-17 22:59:23 +02:00
Jordi Boggiano 7ea2fd6c93 Fix author/copyright 2011-04-17 21:39:53 +02:00
Nils Adermann 933cc6179b Import initial partial port of the libzypp satsolver. 2011-04-05 17:37:19 +02:00