more refactoring #164
Merged
more refactoring #164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shnarazk
commented
Mar 6, 2022
| // self.current_span() - self.scale / 2 | ||
| // self.current_span().saturating_sub(100) | ||
| let num_keep = 2 * (self.current_span() as f64).sqrt() as usize; | ||
| self.current_span() - num_keep |
|
|
Merged
7 tasks
|
based on 424c803
|
…to given clauses
shnarazk
added
type system
shnarazk
added a commit
that referenced
this pull request
Mar 12, 2022
…saving and vivification (#163) * (reduce) implement dynamic reduction rate * tweak processor parameters * +Luby reduction * keep very small learnt clauses after clause reduction * (search) rename local variables * the best * probably better setting * refactored and tweak parameters * add splr-luby * use splr_luby * ditto * select reduction targets based on Luby stabilization span; very fast against problems with small N * new file: src/solver/stage.rs; introduce StageManager * splr-luby/src/lib.rs: add more methods * refactor StageManager and State * (reduce) revert some changes * (RestartIF) s/set_stabilization/set_sensibility/ * tiny refactor * (search) tiny changes * (search) StageManager controls simplify invocation directly * types.rs export SolverEvent; implement Instantiate for StageManager * (StageManager) s/threshold/end_of_stage/ * (StageManager) reorganize local names * more refactoring (#164) * Cargo.toml: disable "dynamci_restart_threshold" temporally * All generated clauses are supposed to be killed unless ... * splr-ema: version 0.1.1; add `EmaIF::set_value` and `Ema::with_value` * (search) fix type * (trail_saving.rs) parameter tuning * a bad direction * quick fix * (Eliminator::eliminate_combination_limit) delete and define as a local constant * renamed: src/processor/eliminator.rs -> src/processor/simplify.rs * rename 'lbd of dp' to 'literal block entanglement' * move Restarter::lbd to ClauseDB * move Restarter::asg to AssignStack as `assign_rate` * splr-ema::Ewa2: add a cache field to hold `1.0 - decay` * restart.rs: reorganize `cfg(feature = "Luby_restart")` * remove meaningless dereference of `as_view` * tweak the initial values of `AssignStack::level` to set valid values to given clauses * increase `ClauseDB:;lbd` when a new assignment is found * update the initial value of `rst_lbd_thr` based on experimentation * increase `ClauseDB:;lbd` when a new assignment is found (part 2) * cargo test * parameter tuning; use cfg! macro instead of cfg attribute * rename 'depG' label to 'entg' * (num_reducible) parameter tuning * (num_reducible) tiny parameter change * AssignStack: add stage_scale * implement stage-controlled trail-saving * implement stage-controlled var activity rescaling * renamed: misc/search.tex -> misc/algorithm.tex
7 tasks
shnarazk
added a commit
that referenced
this pull request
Apr 2, 2022
* a new branch ditch-fast-EMA-20220226 * (types.rs) add `EEA` * silly typo * rename EWA to Ewa * (types.rs) add `Ewa2` * add splr-ema crate * tiny change; ready to comparison * tweak history lengths; comment out fast EMA settings * Stages that control activity, elimination, reduction, restart, trail-saving and vivification (#163) * (reduce) implement dynamic reduction rate * tweak processor parameters * +Luby reduction * keep very small learnt clauses after clause reduction * (search) rename local variables * the best * probably better setting * refactored and tweak parameters * add splr-luby * use splr_luby * ditto * select reduction targets based on Luby stabilization span; very fast against problems with small N * new file: src/solver/stage.rs; introduce StageManager * splr-luby/src/lib.rs: add more methods * refactor StageManager and State * (reduce) revert some changes * (RestartIF) s/set_stabilization/set_sensibility/ * tiny refactor * (search) tiny changes * (search) StageManager controls simplify invocation directly * types.rs export SolverEvent; implement Instantiate for StageManager * (StageManager) s/threshold/end_of_stage/ * (StageManager) reorganize local names * more refactoring (#164) * Cargo.toml: disable "dynamci_restart_threshold" temporally * All generated clauses are supposed to be killed unless ... * splr-ema: version 0.1.1; add `EmaIF::set_value` and `Ema::with_value` * (search) fix type * (trail_saving.rs) parameter tuning * a bad direction * quick fix * (Eliminator::eliminate_combination_limit) delete and define as a local constant * renamed: src/processor/eliminator.rs -> src/processor/simplify.rs * rename 'lbd of dp' to 'literal block entanglement' * move Restarter::lbd to ClauseDB * move Restarter::asg to AssignStack as `assign_rate` * splr-ema::Ewa2: add a cache field to hold `1.0 - decay` * restart.rs: reorganize `cfg(feature = "Luby_restart")` * remove meaningless dereference of `as_view` * tweak the initial values of `AssignStack::level` to set valid values to given clauses * increase `ClauseDB:;lbd` when a new assignment is found * update the initial value of `rst_lbd_thr` based on experimentation * increase `ClauseDB:;lbd` when a new assignment is found (part 2) * cargo test * parameter tuning; use cfg! macro instead of cfg attribute * rename 'depG' label to 'entg' * (num_reducible) parameter tuning * (num_reducible) tiny parameter change * AssignStack: add stage_scale * implement stage-controlled trail-saving * implement stage-controlled var activity rescaling * renamed: misc/search.tex -> misc/algorithm.tex * bump version up to 0.15.0-alpha2
23 tasks
shnarazk
added a commit
that referenced
this pull request
Apr 3, 2022
- Add `RestartManager` and Remove `GeometricStabilizer` #161 - Switch from a decision-making model to a simple dynamics model for restart #164 - `RestartManager` is stored in `State`. - revise the definition of 'literal block entanglement' to accumulate only inter-block clauses (1 < LBD). - Move some EMAs in `rst` to `asg' and `cdb`. #164 - Rescale var activity after the end of the 2nd-level cycle of the Luby series. #163 - Restart stages change the trail-saving setting. #163 - The pre/in processor was demoted as an on-the-fly module. - Add `StageManager`, which compresses var activity after the end of each 2nd-level Luby cycle in order to diversify the direction of search. #161 - Drop refinement on trail_saving; restarts reset dependency. It's enough. - Change the definition of `ProgressASG`. It counts the number of assigned literals after restarts instead of unassigned ones.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merged into #163 .
In this branch, we
ProgressASG. It counts the number of literals after restart.lbd_of_dpand rename it toliteral block entanglement.