Skip to content

Commit b50de40

Browse files
Markdown license and minor formatting changes
1 parent 0d867c7 commit b50de40

File tree

6 files changed

+607
-684
lines changed

6 files changed

+607
-684
lines changed

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
language: julia
2+
23
os:
34
- linux
45
- osx
6+
57
julia:
68
- 0.5
79
- nightly
10+
811
notifications:
912
email: false
13+
1014
sudo: required
15+
1116
addons:
1217
apt_packages:
1318
- gfortran

LICENSE

-675
This file was deleted.

LICENSE.md

+596
Large diffs are not rendered by default.

REQUIRE

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
julia 0.5
22
MathProgBase 0.5.7
33
MAT 0.3.1
4-
Clp 0.2.2

config/solverCfg.jl

+5-8
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,21 @@ if solverName == "CPLEX"
3939

4040
elseif solverName == "GLPKMathProgInterface" || solverName == "GLPK"
4141
solParams = [:Simplex, #Method
42-
true #presolve
42+
true #presolve
4343
] #end of solParams
4444

4545
elseif solverName == "Gurobi"
4646
solParams = [2, #Method
47-
0 #OutputFlag
47+
0 #OutputFlag
4848
] #end of solParams
4949

5050
elseif solverName == "Clp"
51-
solParams = [
52-
] #end of solParams
51+
solParams = [] #end of solParams
5352

5453
elseif solverName == "Mosek"
55-
solParams = [
56-
] #end of solParams
54+
solParams = [] #end of solParams
5755

5856
else
59-
solParams = [
60-
] #end of solParams
57+
solParams = [] #end of solParams
6158
warn("The solver is not supported. No solver parameters have been set.")
6259
end

test/REQUIRE

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ MathProgBase 0.5.7
33
MAT 0.3.1
44
GLPKMathProgInterface 0.2.3
55
GLPK 0.3.0
6+
Clp 0.2.2

0 commit comments

Comments
 (0)