fixed version

jifwin · Jan 1, 2017 · f3fe6a3 · f3fe6a3
1 parent 49c4121
commit f3fe6a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/zad1konspekt10/zad1konspekt10.dat b/zad1konspekt10/zad1konspekt10.dat
@@ -26,9 +26,9 @@ T = {1,2,3};
 
 Tj = 
 [
- [<10,5>, <15,7>, <20,10>]
- [<10,5>, <15,7>, <20,10>]
- [<10,5>, <15,7>, <20,10>]
- [<10,5>, <15,7>, <20,10>]
- [<10,5>, <15,7>, <20,10>]
+ [<10,1>, <15,2>, <20,3>]
+ [<10,1>, <15,2>, <20,3>]
+ [<10,1>, <15,2>, <20,3>]
+ [<10,1>, <15,2>, <20,3>]
+ [<10,1>, <15,2>, <20,3>]
 ];
diff --git a/zad1konspekt10/zad1konspekt10.mod b/zad1konspekt10/zad1konspekt10.mod
@@ -25,7 +25,7 @@ minimize
 
 subject to
 	{
-	forall (s in S) sum(j in J) Js[s][j]*x[s][j] == 1; //todo: if condition
+	forall (s in S) sum(j in J: Js[s][j] == 1) x[s][j] == 1;
 	//forall (j in J) sum (s in S) (Js[s][j]*x[s][j]) <= sum(t in T) (Tj[j][t].number_of_clients * y[j][t]);
 	forall (j in J) sum (s in S) (Js[s][j]*x[s][j]) <= sum(t in T) (Tj[j][t].number_of_clients * y[j][t]);
 	forall (j in J) sum(t in T) y[j][t] <= 1;