Skip to content

Move scip_ptr() method to trait #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmghannam merged 2 commits into from
Nov 1, 2024
Merged

Move scip_ptr() method to trait #170

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29996fd
Move scip_ptr() method to trait
mmghannam Nov 1, 2024
06d1a04
Cargo fmt
mmghannam Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ pub struct ModelSolving {
}

impl Model<ProblemCreated> {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.clone()
}

/// Sets the objective sense of the model to the given value and returns the same `Model` instance.
///
/// # Arguments
Expand Down Expand Up @@ -343,10 +339,6 @@ impl Model<ProblemCreated> {
}

impl ModelSolving {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.upgrade().expect("SCIP instance was dropped")
}

/// Adds a new variable to the model with the given lower bound, upper bound, objective coefficient, name, and type.
///
/// # Arguments
Expand Down Expand Up @@ -457,10 +449,6 @@ impl ModelSolving {
}

impl Model<Solved> {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.clone()
}

/// Returns the objective value of the best solution found by the optimization model.
pub fn obj_val(&self) -> f64 {
self.scip.obj_val()
Expand Down Expand Up @@ -1167,18 +1155,40 @@ macro_rules! impl_WithSolvingStats {

impl_WithSolvingStats!(for Model<Solved>, ModelSolving, Model<ProblemCreated>);

impl<T> Model<T> {
/// Returns a pointer to the underlying SCIP instance.
pub(crate) trait HasScipPtr {
fn scip(&self) -> Rc<ScipPtr>; // Returns a pointer to the underlying SCIP instance.

// Returns a pointer to the underlying SCIP instance.
///
/// # Safety
///
/// This method is unsafe because it returns a raw pointer to the underlying SCIP instance.
/// The caller must ensure that the pointer is used safely and correctly.
#[cfg(feature = "raw")]
pub unsafe fn scip_ptr(&self) -> *mut ffi::SCIP {
self.scip.raw
unsafe fn scip_ptr(&self) -> *mut ffi::SCIP {
self.scip().raw
}
}

impl HasScipPtr for Model<ProblemCreated> {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.clone()
}
}

impl HasScipPtr for Model<Solved> {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.clone()
}
}

impl HasScipPtr for ModelSolving {
fn scip(&self) -> Rc<ScipPtr> {
self.scip.upgrade().expect("SCIP instance was dropped")
}
}

impl<T> Model<T> {
/// Returns the status of the optimization model.
pub fn status(&self) -> Status {
self.scip.status()
Expand Down
Loading