andrey/puzzle-solver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace Coef with i32 in arithmetic overloads.

Browse Source 
We want to redefine Coef to be Rational32.  However, we want to be
able to build linear expressions as easily as before.  We will do this
by retaining the overloads with i32, and introduce new overloads for
operations with Rational32s.
This commit is contained in:
David Wang 2017-03-14 07:52:39 +11:00
parent bf656fcb0d
commit 20e5242624
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/linexpr.rs
View File

@ -5,7 +5,7 @@ use std::collections::hash_map::Entry;
use std::convert::From; use std::convert::From;
use std::ops::{Add,Mul,Neg,Sub}; use std::ops::{Add,Mul,Neg,Sub};
use ::{Coef,LinExpr,VarToken}; use ::{LinExpr,VarToken};
macro_rules! impl_commutative_op { macro_rules! impl_commutative_op {
($LHS:ident + $RHS:ident) => { ($LHS:ident + $RHS:ident) => {
@ -33,8 +33,8 @@ macro_rules! impl_subtract_op {
/*--------------------------------------------------------------*/ /*--------------------------------------------------------------*/
impl From<Coef> for LinExpr { impl From<i32> for LinExpr {
fn from(constant: Coef) -> Self { fn from(constant: i32) -> Self {
LinExpr { LinExpr {
constant: constant, constant: constant,
coef: HashMap::new(), coef: HashMap::new(),
@ -65,26 +65,26 @@ impl Neg for VarToken {
} }
} }
impl Add<Coef> for VarToken { impl Add<i32> for VarToken {
type Output = LinExpr; type Output = LinExpr;
fn add(self, rhs: Coef) -> Self::Output { fn add(self, rhs: i32) -> Self::Output {
LinExpr::from(self) + rhs LinExpr::from(self) + rhs
} }
} }
impl_commutative_op!(Coef + VarToken); impl_commutative_op!(i32 + VarToken);
impl_subtract_op!(VarToken - Coef); impl_subtract_op!(VarToken - i32);
impl_subtract_op!(Coef - VarToken); impl_subtract_op!(i32 - VarToken);
impl Mul<Coef> for VarToken { impl Mul<i32> for VarToken {
type Output = LinExpr; type Output = LinExpr;
fn mul(self, rhs: Coef) -> Self::Output { fn mul(self, rhs: i32) -> Self::Output {
LinExpr::from(self) * rhs LinExpr::from(self) * rhs
} }
} }
impl_commutative_op!(Coef * VarToken); impl_commutative_op!(i32 * VarToken);
/*--------------------------------------------------------------*/ /*--------------------------------------------------------------*/
/* Var-Var */ /* Var-Var */
@ -110,22 +110,22 @@ impl Neg for LinExpr {
} }
} }
impl Add<Coef> for LinExpr { impl Add<i32> for LinExpr {
type Output = LinExpr; type Output = LinExpr;
fn add(mut self, rhs: Coef) -> Self::Output { fn add(mut self, rhs: i32) -> Self::Output {
self.constant = self.constant + rhs; self.constant = self.constant + rhs;
self self
} }
} }
impl_commutative_op!(Coef + LinExpr); impl_commutative_op!(i32 + LinExpr);
impl_subtract_op!(LinExpr - Coef); impl_subtract_op!(LinExpr - i32);
impl_subtract_op!(Coef - LinExpr); impl_subtract_op!(i32 - LinExpr);
impl Mul<Coef> for LinExpr { impl Mul<i32> for LinExpr {
type Output = LinExpr; type Output = LinExpr;
fn mul(mut self, rhs: Coef) -> Self::Output { fn mul(mut self, rhs: i32) -> Self::Output {
if rhs == 0 { if rhs == 0 {
self.constant = 0; self.constant = 0;
self.coef = HashMap::new(); self.coef = HashMap::new();
@ -140,7 +140,7 @@ impl Mul<Coef> for LinExpr {
} }
} }
impl_commutative_op!(Coef * LinExpr); impl_commutative_op!(i32 * LinExpr);
/*--------------------------------------------------------------*/ /*--------------------------------------------------------------*/
/* Expr-Var */ /* Expr-Var */