feat: ajout des modifs de la dernière fois

This commit is contained in:
Laurent Fainsin 2021-11-23 20:22:30 +01:00
parent 5e2d153d9e
commit 4df8e990d5
17 changed files with 6 additions and 185 deletions

0
.gitignore vendored Normal file → Executable file
View file

0
docs/rapport.md Normal file → Executable file
View file

0
exo1/voitures.lp Normal file → Executable file
View file

0
exo1/voitures.sol Normal file → Executable file
View file

0
exo2/personnel.dat Normal file → Executable file
View file

0
exo2/personnel.mod Normal file → Executable file
View file

0
exo2/personnel.sol Normal file → Executable file
View file

0
exo3/bourse.lp Normal file → Executable file
View file

0
exo3/bourse.sol Normal file → Executable file
View file

0
exo4/ecommerce.dat Normal file → Executable file
View file

0
exo4/ecommerce.mod Normal file → Executable file
View file

0
exo4/ecommerce.sol Normal file → Executable file
View file

View file

@ -1,77 +0,0 @@
Problem: ecommerce
Rows: 11
Columns: 12
Non-zeros: 33
Status: OPTIMAL
Objective: CoutTotal = 5.25 (MINimum)
No. Row name St Activity Lower bound Upper bound Marginal
------ ------------ -- ------------- ------------- ------------- -------------
1 ProportionTotalUn[d1,f1]
NS 1 1 = 2
2 ProportionTotalUn[d1,f2]
NS 1 1 = 1
3 ProportionTotalUn[d2,f1]
NS 1 1 = 2
4 ProportionTotalUn[d2,f2]
NS 1 1 = 3
5 RespectDesStocks[f1,m1]
NU 2.5 2.5 -0.5
6 RespectDesStocks[f1,m2]
B 0.5 1
7 RespectDesStocks[f1,m3]
B 0 2
8 RespectDesStocks[f2,m1]
NU 1 1 -0.666667
9 RespectDesStocks[f2,m2]
B 1 2
10 RespectDesStocks[f2,m3]
NU 1 1 -0.333333
11 CoutTotal B 5.25
No. Column name St Activity Lower bound Upper bound Marginal
------ ------------ -- ------------- ------------- ------------- -------------
1 coef[d1,f1,m1]
B 0.75 0 1
2 coef[d1,f1,m2]
B 0.25 0 1
3 coef[d1,f1,m3]
NL 0 0 1 1
4 coef[d1,f2,m1]
B 1 0 1
5 coef[d1,f2,m2]
NL 0 0 1 2
6 coef[d1,f2,m3]
NL 0 0 1 1
7 coef[d2,f1,m1]
NU 1 0 1 -0.5
8 coef[d2,f1,m2]
B 0 0 1
9 coef[d2,f1,m3]
NL 0 0 1 1
10 coef[d2,f2,m1]
B 0.333333 0 1
11 coef[d2,f2,m2]
B 0.333333 0 1
12 coef[d2,f2,m3]
B 0.333333 0 1
Karush-Kuhn-Tucker optimality conditions:
KKT.PE: max.abs.err = 4.44e-16 on row 8
max.rel.err = 1.48e-16 on row 8
High quality
KKT.PB: max.abs.err = 0.00e+00 on row 0
max.rel.err = 0.00e+00 on row 0
High quality
KKT.DE: max.abs.err = 0.00e+00 on column 0
max.rel.err = 0.00e+00 on column 0
High quality
KKT.DB: max.abs.err = 0.00e+00 on row 0
max.rel.err = 0.00e+00 on row 0
High quality
End of output

View file

@ -1,101 +0,0 @@
Problem: ecommerce
Rows: 23
Columns: 12
Non-zeros: 45
Status: OPTIMAL
Objective: CoutTotal = 8 (MINimum)
No. Row name St Activity Lower bound Upper bound Marginal
------ ------------ -- ------------- ------------- ------------- -------------
1 ProportionZeroUn[d1,f1,m1]
B 0.75 1
2 ProportionZeroUn[d1,f1,m2]
B 0.25 1
3 ProportionZeroUn[d1,f1,m3]
B 0 1
4 ProportionZeroUn[d1,f2,m1]
B 1 1
5 ProportionZeroUn[d1,f2,m2]
B 0 1
6 ProportionZeroUn[d1,f2,m3]
B 0 1
7 ProportionZeroUn[d2,f1,m1]
NU 1 1 -3
8 ProportionZeroUn[d2,f1,m2]
B 0 1
9 ProportionZeroUn[d2,f1,m3]
B 0 1
10 ProportionZeroUn[d2,f2,m1]
B 0.333333 1
11 ProportionZeroUn[d2,f2,m2]
B 0.333333 1
12 ProportionZeroUn[d2,f2,m3]
B 0.333333 1
13 ProportionTotalUn[d1,f1]
NS 1 1 = 2
14 ProportionTotalUn[d1,f2]
NS 1 1 = 2
15 ProportionTotalUn[d2,f1]
NS 1 1 = 4
16 ProportionTotalUn[d2,f2]
NS 1 1 = 5
17 RespectDesStocks[f1,m1]
NU 2.5 2.5 < eps
18 RespectDesStocks[f1,m2]
B 0.5 1
19 RespectDesStocks[f1,m3]
B 0 2
20 RespectDesStocks[f2,m1]
NU 1 1 -1.33333
21 RespectDesStocks[f2,m2]
B 1 2
22 RespectDesStocks[f2,m3]
NU 1 1 -0.666667
23 CoutTotal B 8
No. Column name St Activity Lower bound Upper bound Marginal
------ ------------ -- ------------- ------------- ------------- -------------
1 coef[d1,f1,m1]
B 0.75 0
2 coef[d1,f1,m2]
B 0.25 0
3 coef[d1,f1,m3]
NL 0 0 1
4 coef[d1,f2,m1]
B 1 0
5 coef[d1,f2,m2]
NL 0 0 1
6 coef[d1,f2,m3]
NL 0 0 < eps
7 coef[d2,f1,m1]
B 1 0
8 coef[d2,f1,m2]
NL 0 0 < eps
9 coef[d2,f1,m3]
B 0 0
10 coef[d2,f2,m1]
B 0.333333 0
11 coef[d2,f2,m2]
B 0.333333 0
12 coef[d2,f2,m3]
B 0.333333 0
Karush-Kuhn-Tucker optimality conditions:
KKT.PE: max.abs.err = 4.44e-16 on row 20
max.rel.err = 1.48e-16 on row 20
High quality
KKT.PB: max.abs.err = 0.00e+00 on row 0
max.rel.err = 0.00e+00 on row 0
High quality
KKT.DE: max.abs.err = 0.00e+00 on column 0
max.rel.err = 0.00e+00 on column 0
High quality
KKT.DB: max.abs.err = 0.00e+00 on row 0
max.rel.err = 0.00e+00 on row 0
High quality
End of output

0
exobonus/bonus.dat Normal file → Executable file
View file

13
exobonus/bonus.mod Normal file → Executable file
View file

@ -1,4 +1,3 @@
#
# 0 1 2 3 5 # 0 1 2 3 5
# 1 0 1 2 3 # 1 0 1 2 3
# 2 1 0 1 2 # 2 1 0 1 2
@ -18,10 +17,6 @@
# 1 0 0 0 0 # 1 0 0 0 0
# #
# 4 2 3 5 1 # 4 2 3 5 1
#
# GLPK model file created by SUN for RO teaching
############################### Model ############################### ############################### Model ###############################
@ -47,8 +42,12 @@ s.t. RespectUnePersonneParTravail{j in POSITIONS}:
sum{i in POSITIONS} cycle[i, j] = 1; sum{i in POSITIONS} cycle[i, j] = 1;
# Pas de sous cycle # Pas de sous cycle
s.t. SousCycle1{(i in POSITIONS, j in POSITIONS):(i <= j and i < 4)}: s.t. SousCycle{i in POSITIONS, j in POSITIONS}:
sum{k in POSITIONS, l in POSITIONS: i <= k <= j, i <= l <= j} cycle[k, l] <= (j - i + 1);
if (i <= j && i < 4) then
sum {k in POSITIONS, l in POSITIONS} (cycle[k, l] && (i <= k <= j && i <= l <= j)) <= (j - i + 1))
else
true;
###### Objective ###### ###### Objective ######

0
script.sh Normal file → Executable file
View file