RsBundle  Diff

Differences From Artifact [8812d1b271]:

  • File src/mcf/problem.rs — part of check-in [39f01e7103] at 2021-05-07 20:25:21 on branch trunk — Add rs-graph-based mmcf solver (user: fifr size: 17900)

To Artifact [c69a786370]:

  • File src/mcf/problem.rs — part of check-in [ad538a4f5b] at 2021-05-09 19:33:12 on branch trunk — Address some clippy warnings (user: fifr size: 17772)

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
        let ncom;
        let nnodes;
        let narcs;
        let ncaps;

        {
            let mut data = buffer.split_whitespace();
            ncom = data.next().ok_or_else(|| MissingNodField("ncom"))?.parse::<usize>()?;
            nnodes = data.next().ok_or_else(|| MissingNodField("nnodes"))?.parse::<usize>()?;
            narcs = data.next().ok_or_else(|| MissingNodField("narcs"))?.parse::<usize>()?;
            ncaps = data.next().ok_or_else(|| 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::Solver::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_else(|| MissingSupField("node"))?.parse::<usize>()?;
            let com = data.next().ok_or_else(|| MissingSupField("com"))?.parse::<usize>()?;
            let supply = data.next().ok_or_else(|| MissingSupField("supply"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraSupField);
            }
            if node < 1 || node > nnodes {
                return Err(InvalidNode(node, nnodes));
            }
            if com < 1 || com > ncom {







|
|
|
|

















|
|
|







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
        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::Solver::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);
            }
            if node < 1 || node > nnodes {
                return Err(InvalidNode(node, nnodes));
            }
            if com < 1 || com > ncom {
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
        {
            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_else(|| MissingArcField("arc"))?.parse::<usize>()?;
            let src = data.next().ok_or_else(|| MissingArcField("src"))?.parse::<usize>()?;
            let snk = data.next().ok_or_else(|| MissingArcField("snk"))?.parse::<usize>()?;
            let com = data.next().ok_or_else(|| MissingArcField("com"))?.parse::<usize>()?;
            let cost = data.next().ok_or_else(|| MissingArcField("cost"))?.parse::<Real>()?;
            let cap = data.next().ok_or_else(|| MissingArcField("cap"))?.parse::<Real>()?;
            let mt = data.next().ok_or_else(|| MissingArcField("mt"))?.parse::<usize>()?;
            if data.next().is_some() {
                return Err(ExtraArcField);
            }
            if arc < 1 || arc > narcs {
                return Err(InvalidArc(arc, narcs));
            }
            if src < 1 || src > nnodes {







|
|
|
|
|
|
|







249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
        {
            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>()?;
            let mt = data.next().ok_or(MissingArcField("mt"))?.parse::<usize>()?;
            if data.next().is_some() {
                return Err(ExtraArcField);
            }
            if arc < 1 || arc > narcs {
                return Err(InvalidArc(arc, narcs));
            }
            if src < 1 || src > nnodes {
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
            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_else(|| MissingMutField("mt"))?.parse::<usize>()?;
            let cap = data.next().ok_or_else(|| MissingMutField("cap"))?.parse::<Real>()?;
            if data.next().is_some() {
                return Err(ExtraMutField);
            }
            if mt < 1 || mt > ncaps {
                return Err(InvalidMut(mt, ncaps));
            }
            rhs[mt - 1] = cap;







|
|







297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
            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 {
                return Err(InvalidMut(mt, ncaps));
            }
            rhs[mt - 1] = cap;
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
            })
            .collect::<Vec<_>>();

        let subdatas = cbase
            .into_iter()
            .zip(lhs)
            .zip(std::iter::once(rhs).chain(std::iter::repeat(dvec![])))
            .map(|((cbase, lhs), rhs)| SubData { cbase, lhs, rhs })
            .map(Arc::new)
            .collect();

        let subproblems = nets
            .into_iter()
            .map(|net| Subproblem { net, c: dvec![] })
            .map(RwLock::new)







|







321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
            })
            .collect::<Vec<_>>();

        let subdatas = cbase
            .into_iter()
            .zip(lhs)
            .zip(std::iter::once(rhs).chain(std::iter::repeat(dvec![])))
            .map(|((cbase, lhs), rhs)| SubData { lhs, rhs, cbase })
            .map(Arc::new)
            .collect();

        let subproblems = nets
            .into_iter()
            .map(|net| Subproblem { net, c: dvec![] })
            .map(RwLock::new)