RsBundle  Check-in [886776eee6]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update dependency on env_logger to v0.5.3
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk | 0.4.1
Files: files | file ages | folders
SHA1: 886776eee63a0b9ef3855a4b9d8eaa141e06c092
User & Date: fifr 2018-01-26 20:50:16.670
Context
2018-03-08
14:55
Update to cplex-sys 0.4 and Cplex 12.8 check-in: fb204410e1 user: fifr tags: trunk
2018-01-26
20:50
Update dependency on env_logger to v0.5.3 check-in: 886776eee6 user: fifr tags: 0.4.1, trunk
2017-12-28
23:07
Update dependency on log to v0.4 check-in: 39f7398b3e user: fifr tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Cargo.toml.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
[package]
name = "bundle"
version = "0.4.0"
authors = ["Frank Fischer <frank-fischer@shadow-soft.de>"]

[dependencies]
itertools = "^0.7.2"
libc = "^0.2.6"
failure = "^0.1.0"
failure_derive = "^0.1.0"
log = "^0.4"
c_str_macro = "^1.0"
cplex-sys = "^0.3"

[dev-dependencies]
env_logger = "^0.4.1"


|












|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
[package]
name = "bundle"
version = "0.4.1"
authors = ["Frank Fischer <frank-fischer@shadow-soft.de>"]

[dependencies]
itertools = "^0.7.2"
libc = "^0.2.6"
failure = "^0.1.0"
failure_derive = "^0.1.0"
log = "^0.4"
c_str_macro = "^1.0"
cplex-sys = "^0.3"

[dev-dependencies]
env_logger = "^0.5.3"
Changes to examples/mmcf.rs.
1
2
3
4
5
6
7
8
9
/*
 * Copyright (c) 2016, 2017 Frank Fischer <frank-fischer@shadow-soft.de>
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but

|







1
2
3
4
5
6
7
8
9
/*
 * Copyright (c) 2016, 2017, 2018 Frank Fischer <frank-fischer@shadow-soft.de>
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
extern crate log;

use bundle::{FirstOrderProblem, Solver, SolverParams, StandardTerminator};
use bundle::mcf;
use std::env;

fn main() {
    env_logger::init().unwrap();

    let mut args = env::args();
    let program = args.next().unwrap();

    if let Some(filename) = args.next() {
        info!("Reading instance: {}", filename);
        let mut mmcf = mcf::MMCFProblem::read_mnetgen(&filename).unwrap();







|







21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
extern crate log;

use bundle::{FirstOrderProblem, Solver, SolverParams, StandardTerminator};
use bundle::mcf;
use std::env;

fn main() {
    env_logger::init();

    let mut args = env::args();
    let program = args.next().unwrap();

    if let Some(filename) = args.next() {
        info!("Reading instance: {}", filename);
        let mut mmcf = mcf::MMCFProblem::read_mnetgen(&filename).unwrap();
Changes to examples/quadratic.rs.
1
2
3
4
5
6
7
8
9
/*
 * Copyright (c) 2016, 2017 Frank Fischer <frank-fischer@shadow-soft.de>
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but

|







1
2
3
4
5
6
7
8
9
/*
 * Copyright (c) 2016, 2017, 2018 Frank Fischer <frank-fischer@shadow-soft.de>
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
extern crate env_logger;
extern crate failure;
#[macro_use]
extern crate log;

use bundle::{DVector, FirstOrderProblem, Minorant, Real, SimpleEvaluation, Solver, SolverParams};
use failure::Error;


struct QuadraticProblem {
    a: [[Real; 2]; 2],
    b: [Real; 2],
    c: Real,
}








<







20
21
22
23
24
25
26

27
28
29
30
31
32
33
extern crate env_logger;
extern crate failure;
#[macro_use]
extern crate log;

use bundle::{DVector, FirstOrderProblem, Minorant, Real, SimpleEvaluation, Solver, SolverParams};
use failure::Error;


struct QuadraticProblem {
    a: [[Real; 2]; 2],
    b: [Real; 2],
    c: Real,
}

84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
                ),
            ],
        })
    }
}

fn main() {
    env_logger::init().unwrap();

    let f = QuadraticProblem::new();
    let mut solver = Solver::new_params(
        f,
        SolverParams {
            min_weight: 1.0,
            max_weight: 1.0,
            ..Default::default()
        },
    ).unwrap();
    solver.solve().unwrap();
}







|












83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
                ),
            ],
        })
    }
}

fn main() {
    env_logger::init();

    let f = QuadraticProblem::new();
    let mut solver = Solver::new_params(
        f,
        SolverParams {
            min_weight: 1.0,
            max_weight: 1.0,
            ..Default::default()
        },
    ).unwrap();
    solver.solve().unwrap();
}