Skip to content

Commit

Permalink
Merge branch 'main' of github.com:scipopt/russcip into development
Browse files Browse the repository at this point in the history
  • Loading branch information
mmghannam committed Jul 27, 2023
2 parents 248aebf + 3659358 commit 03e1993
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

## unreleased
### Added
- Primal heuristic plugin
- Primal heuristic plugin.
- Solving Model state, to represent methods accessible when during solving.
- Moved solution query methods to its own trait.
### Fixed
### Changed
- Moved ScipPtr struct and methods to its own module.
Expand Down
2 changes: 1 addition & 1 deletion src/heuristic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl From<HeurResult> for u32 {

#[cfg(test)]
mod tests {
use crate::{Model, ModelWithProblem, ProblemOrSolving, SolError, Solving};
use crate::{Model, ModelWithProblem, ProblemOrSolving, Solving};

use super::*;

Expand Down
1 change: 0 additions & 1 deletion src/model.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::cell::RefCell;
use std::collections::BTreeMap;

use std::rc::Rc;

use crate::constraint::Constraint;
Expand Down
2 changes: 1 addition & 1 deletion src/solution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ mod tests {

assert_eq!(sol.obj_val(), model.obj_val());
}
}
}

0 comments on commit 03e1993

Please sign in to comment.