RsBundle  Diff

Differences From Artifact [bed26186fb]:

  • File src/mcf/problem.rs — part of check-in [3388440148] at 2016-09-28 06:15:44 on branch trunk — Add MMCF problem and solver. (user: fifr size: 8281)

To Artifact [7f584dec43]:

  • File src/mcf/problem.rs — part of check-in [4a174be0f5] at 2016-09-28 16:30:41 on branch trunk — mcf: Support disaggregated subproblems. (user: fifr size: 8980)

56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
#[derive(Clone, Copy, Debug)]
struct ArcInfo { arc : usize, src : usize, snk : usize }

#[derive(Clone, Copy, Debug)]
struct Elem { ind : usize, val : Real }

pub struct MMCFProblem  {
    multimodel : bool,

    nets : Vec<mcf::Solver>,
    lhs : Vec<Vec<Vec<Elem>>>,
    rhs : DVector,
    rhsval : Real,
    cbase : Vec<DVector>,
    c : Vec<DVector>,







|







56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
#[derive(Clone, Copy, Debug)]
struct ArcInfo { arc : usize, src : usize, snk : usize }

#[derive(Clone, Copy, Debug)]
struct Elem { ind : usize, val : Real }

pub struct MMCFProblem  {
    pub multimodel : bool,

    nets : Vec<mcf::Solver>,
    lhs : Vec<Vec<Vec<Elem>>>,
    rhs : DVector,
    rhsval : Real,
    cbase : Vec<DVector>,
    c : Vec<DVector>,
220
221
222
223
224
225
226


227






228











229
230
231
232
233
234
235
        for (i,net) in self.nets.iter_mut().enumerate() {
            try!(net.solve());
            debug!("c[{}]={}", i, try!(net.objective()));
        }

        // compute minorant
        if self.multimodel {


            assert!(fidx == 0);






            unimplemented!();











        } else {
            let mut objective = self.rhsval;
            let mut sols = Vec::with_capacity(self.nets.len());
            for i in 0..self.nets.len() {
                objective -= try!(self.nets[i].objective());
                sols.push(try!(self.nets[i].get_solution()));
            }







>
>
|
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>







220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
        for (i,net) in self.nets.iter_mut().enumerate() {
            try!(net.solve());
            debug!("c[{}]={}", i, try!(net.objective()));
        }

        // compute minorant
        if self.multimodel {
            let objective;
            let mut subg;
            if fidx == 0 {
                subg = self.rhs.clone();
                objective = self.rhsval - try!(self.nets[fidx].objective());
            } else {
                subg = dvec![0.0; self.rhs.len()];
                objective = -try!(self.nets[fidx].objective());
            }

            let sol = try!(self.nets[fidx].get_solution());
            for i in 0..self.lhs.len() {
                for elem in &self.lhs[i][fidx] {
                    subg[i] -= elem.val * sol[elem.ind];
                }
            }

            Ok(SimpleEvaluation {
                objective: objective,
                minorants: vec![Minorant { constant: objective, linear: subg }],
            })
        } else {
            let mut objective = self.rhsval;
            let mut sols = Vec::with_capacity(self.nets.len());
            for i in 0..self.nets.len() {
                objective -= try!(self.nets[i].objective());
                sols.push(try!(self.nets[i].get_solution()));
            }