RsBundle  Diff

Differences From Artifact [4c23583ac2]:

  • File src/mcf/problem.rs — part of check-in [e3b961e889] at 2021-06-30 12:22:12 on branch trunk — mcf/problem: remove unneeded `&` (user: fifr size: 18034)

To Artifact [a8ae14dfaa]:

  • File src/mcf/problem.rs — part of check-in [ff08b91f61] at 2021-06-30 20:22:43 on branch trunk — mmcf: simplify reading netgen instances (user: fifr size: 17710)

23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
use log::{debug, warn};
use num_traits::Float;
use thiserror::Error;
use threadpool::ThreadPool;

use std::f64::INFINITY;
use std::fs::File;
use std::io::Read;
use std::result;
use std::sync::{Arc, RwLock};

/// An error in the mmcf file format.
#[derive(Debug, Error)]
#[non_exhaustive]
pub enum MMCFReadError {







|







23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
use log::{debug, warn};
use num_traits::Float;
use thiserror::Error;
use threadpool::ThreadPool;

use std::f64::INFINITY;
use std::fs::File;
use std::io::{BufRead, BufReader, Read};
use std::result;
use std::sync::{Arc, RwLock};

/// An error in the mmcf file format.
#[derive(Debug, Error)]
#[non_exhaustive]
pub enum MMCFReadError {
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240

    pub fn read_mnetgen_with_solver<S>(basename: &str) -> std::result::Result<MMCFProblem, MMCFReadError>
    where
        S: Solver + 'static,
    {
        use MMCFReadError::*;

        let mut buffer = String::new();
        {
            let mut f = File::open(&format!("{}.nod", basename))?;
            f.read_to_string(&mut buffer)?;
        }

        let ncom;
        let nnodes;
        let narcs;
        let ncaps;

        {
            let mut data = buffer.split_whitespace();
            ncom = data.next().ok_or(MissingNodField("ncom"))?.parse::<usize>()?;
            nnodes = data.next().ok_or(MissingNodField("nnodes"))?.parse::<usize>()?;
            narcs = data.next().ok_or(MissingNodField("narcs"))?.parse::<usize>()?;
            ncaps = data.next().ok_or(MissingNodField("ncaps"))?.parse::<usize>()?;
            if data.next().is_some() {
                return Err(ExtraNodField);
            }
        }

        // read nodes
        let mut nets = Vec::with_capacity(ncom);
        for i in 0..ncom {
            nets.push(mcf::NetSpxSolver::new(i, nnodes)?)
        }
        {
            let mut f = File::open(&format!("{}.sup", basename))?;
            buffer.clear();
            f.read_to_string(&mut buffer)?;
        }
        for line in buffer.lines() {
            let mut data = line.split_whitespace();
            let node = data.next().ok_or(MissingSupField("node"))?.parse::<usize>()?;
            let com = data.next().ok_or(MissingSupField("com"))?.parse::<usize>()?;
            let supply = data.next().ok_or(MissingSupField("supply"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraSupField);
            }







<
<
<
<
<
<






|
|
|
|
|










<
|
<
<
<
|







194
195
196
197
198
199
200






201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221

222



223
224
225
226
227
228
229
230

    pub fn read_mnetgen_with_solver<S>(basename: &str) -> std::result::Result<MMCFProblem, MMCFReadError>
    where
        S: Solver + 'static,
    {
        use MMCFReadError::*;







        let ncom;
        let nnodes;
        let narcs;
        let ncaps;

        {
            let mut data = File::open(&format!("{}.nod", basename)).map(BufReader::new)?.lines();
            ncom = data.next().ok_or(MissingNodField("ncom"))??.parse::<usize>()?;
            nnodes = data.next().ok_or(MissingNodField("nnodes"))??.parse::<usize>()?;
            narcs = data.next().ok_or(MissingNodField("narcs"))??.parse::<usize>()?;
            ncaps = data.next().ok_or(MissingNodField("ncaps"))??.parse::<usize>()?;
            if data.next().is_some() {
                return Err(ExtraNodField);
            }
        }

        // read nodes
        let mut nets = Vec::with_capacity(ncom);
        for i in 0..ncom {
            nets.push(mcf::NetSpxSolver::new(i, nnodes)?)
        }

        for line in File::open(&format!("{}.sup", basename)).map(BufReader::new)?.lines() {



            let line = line?;
            let mut data = line.split_whitespace();
            let node = data.next().ok_or(MissingSupField("node"))?.parse::<usize>()?;
            let com = data.next().ok_or(MissingSupField("com"))?.parse::<usize>()?;
            let supply = data.next().ok_or(MissingSupField("supply"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraSupField);
            }
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268

        // read arcs
        let mut arcmap = vec![vec![]; ncom];
        let mut cbase = vec![dvec![]; ncom];

        // lhs nonzeros
        let mut lhsidx = vec![vec![vec![]; ncom]; ncaps];
        {
            let mut f = File::open(&format!("{}.arc", basename))?;
            buffer.clear();
            f.read_to_string(&mut buffer)?;
        }
        for line in buffer.lines() {
            let mut data = line.split_whitespace();
            let arc = data.next().ok_or(MissingArcField("arc"))?.parse::<usize>()?;
            let src = data.next().ok_or(MissingArcField("src"))?.parse::<usize>()?;
            let snk = data.next().ok_or(MissingArcField("snk"))?.parse::<usize>()?;
            let com = data.next().ok_or(MissingArcField("com"))?.parse::<usize>()?;
            let cost = data.next().ok_or(MissingArcField("cost"))?.parse::<Real>()?;
            let cap = data.next().ok_or(MissingArcField("cap"))?.parse::<Real>()?;







<
|
<
<
<
|







239
240
241
242
243
244
245

246



247
248
249
250
251
252
253
254

        // read arcs
        let mut arcmap = vec![vec![]; ncom];
        let mut cbase = vec![dvec![]; ncom];

        // lhs nonzeros
        let mut lhsidx = vec![vec![vec![]; ncom]; ncaps];

        for line in File::open(&format!("{}.arc", basename)).map(BufReader::new)?.lines() {



            let line = line?;
            let mut data = line.split_whitespace();
            let arc = data.next().ok_or(MissingArcField("arc"))?.parse::<usize>()?;
            let src = data.next().ok_or(MissingArcField("src"))?.parse::<usize>()?;
            let snk = data.next().ok_or(MissingArcField("snk"))?.parse::<usize>()?;
            let com = data.next().ok_or(MissingArcField("com"))?.parse::<usize>()?;
            let cost = data.next().ok_or(MissingArcField("cost"))?.parse::<Real>()?;
            let cap = data.next().ok_or(MissingArcField("cap"))?.parse::<Real>()?;
296
297
298
299
300
301
302
303
304
305
306
307
308

309
310
311
312
313
314
315
316
                                   // add to mutual capacity constraint
            if mt > 0 {
                lhsidx[(mt - 1) as usize][com].push(coeff);
            }
        }

        // read rhs of coupling constraints
        {
            let mut f = File::open(&format!("{}.mut", basename))?;
            buffer.clear();
            f.read_to_string(&mut buffer)?;
        }
        let mut rhs = dvec![0.0; ncaps];

        for line in buffer.lines() {
            let mut data = line.split_whitespace();
            let mt = data.next().ok_or(MissingMutField("mt"))?.parse::<usize>()?;
            let cap = data.next().ok_or(MissingMutField("cap"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraMutField);
            }
            if mt < 1 || mt > ncaps {







<
<
<
<
<

>
|







282
283
284
285
286
287
288





289
290
291
292
293
294
295
296
297
298
                                   // add to mutual capacity constraint
            if mt > 0 {
                lhsidx[(mt - 1) as usize][com].push(coeff);
            }
        }

        // read rhs of coupling constraints





        let mut rhs = dvec![0.0; ncaps];
        for line in File::open(&format!("{}.mut", basename)).map(BufReader::new)?.lines() {
            let line = line?;
            let mut data = line.split_whitespace();
            let mt = data.next().ok_or(MissingMutField("mt"))?.parse::<usize>()?;
            let cap = data.next().ok_or(MissingMutField("cap"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraMutField);
            }
            if mt < 1 || mt > ncaps {