merge recent changes

author: Alberto Ruiz <aruiz@um.es> 2015-04-09 12:48:57 +0200
committer: Alberto Ruiz <aruiz@um.es> 2015-04-09 12:48:57 +0200
commit: c10f27ac40ff74612a6c773baa572573f3186506 (patch)
tree: efe9bf1b62e20c1163eed98753c4bef2afca6d06 /packages/glpk/src/C
parent: 5eba1bc309d7845366e8d00849d85426bf8f666d (diff)
parent: 8d7c921bdff0d57a4579d3de71cd5ba3bf5276a1 (diff)
1 files changed, 67 insertions, 63 deletions
diff --git a/packages/glpk/src/C/glpk.c b/packages/glpk/src/C/glpk.c
index bfbb435..86b1277 100644
--- a/packages/glpk/src/C/glpk.c
+++ b/packages/glpk/src/C/glpk.c
@@ -10,67 +10,71 @@
 /*-----------------------------------------------------*/
-int c_simplex_sparse(int m, int n, DMAT(c), DMAT(b), DVEC(s)) {
+#define C_X_SPARSE(X)                                           \
-    glp_prob *lp;
+  int c_##X##_sparse(int m, int n, DMAT(c), DMAT(b), DVEC(s)) { \
-    lp = glp_create_prob();
+    glp_prob *lp;                                               \
-    glp_set_obj_dir(lp, GLP_MAX);
+    lp = glp_create_prob();                                     \
-    int i,j,k;
+    glp_set_obj_dir(lp, GLP_MAX);                               \
-    int tot = cr - n;
+    int i,j,k;                                                  \
-    glp_add_rows(lp, m);
+    int tot = cr - n;                                           \
-    glp_add_cols(lp, n);
+    glp_add_rows(lp, m);                                        \
+    glp_add_cols(lp, n);                                        \
+                                                                \
+    /*printf("%d %d\n",m,n);*/                                  \
+                                                                \
+    /* the first n values */                                    \
+    for (k=1;k<=n;k++) {                                        \
+      glp_set_obj_coef(lp, k, AT(c, k-1, 2));                   \
+      /*printf("%d %f\n",k,AT(c, k-1, 2)); */                   \
+    }                                                           \
+                                                                \
+    int * ia = malloc((1+tot)*sizeof(int));                     \
+    int * ja = malloc((1+tot)*sizeof(int));                     \
+    double * ar = malloc((1+tot)*sizeof(double));               \
+                                                                \
+    for (k=1; k<= tot; k++) {                                   \
+      ia[k] = rint(AT(c,k-1+n,0));                              \
+      ja[k] = rint(AT(c,k-1+n,1));                              \
+      ar[k] =      AT(c,k-1+n,2);                               \
+      /*printf("%d %d %f\n",ia[k],ja[k],ar[k]);*/               \
+    }                                                           \
+    glp_load_matrix(lp, tot, ia, ja, ar);                       \
+                                                                \
+    int t;                                                      \
+    for (i=1;i<=m;i++) {                                        \
+      switch((int)rint(AT(b,i-1,0))) {                          \
+      case 0: { t = GLP_FR; break; }                            \
+      case 1: { t = GLP_LO; break; }                            \
+      case 2: { t = GLP_UP; break; }                            \
+      case 3: { t = GLP_DB; break; }                            \
+      default: { t = GLP_FX; break; }                           \
+      }                                                         \
+      glp_set_row_bnds(lp, i, t , AT(b,i-1,1), AT(b,i-1,2));    \
+    }                                                           \
+    for (j=1;j<=n;j++) {                                        \
+      switch((int)rint(AT(b,m+j-1,0))) {                        \
+      case 0: { t = GLP_FR; break; }                            \
+      case 1: { t = GLP_LO; break; }                            \
+      case 2: { t = GLP_UP; break; }                            \
+      case 3: { t = GLP_DB; break; }                            \
+      default: { t = GLP_FX; break; }                           \
+      }                                                         \
+      glp_set_col_bnds(lp, j, t , AT(b,m+j-1,1), AT(b,m+j-1,2));        \
+    }                                                                   \
+    glp_term_out(0);                                                    \
+    glp_##X(lp, NULL);                                                  \
+      sp[0] = glp_get_status(lp);                                       \
+      sp[1] = glp_get_obj_val(lp);                                      \
+      for (k=1; k<=n; k++) {                                            \
+        sp[k+1] = glp_get_col_prim(lp, k);                              \
+      }                                                                 \
+      glp_delete_prob(lp);                                              \
+      free(ia);                                                         \
+      free(ja);                                                         \
+      free(ar);                                                         \
+                                                                        \
+      return 0;                                                         \
+  }                                                                     \
-    //printf("%d %d\n",m,n);
+C_X_SPARSE(simplex);
+C_X_SPARSE(exact);
-    // the first n values
-    for (k=1;k<=n;k++) {
-        glp_set_obj_coef(lp, k, AT(c, k-1, 2));
-        //printf("%d %f\n",k,AT(c, k-1, 2));
-    }
-    int * ia = malloc((1+tot)*sizeof(int));
-    int * ja = malloc((1+tot)*sizeof(int));
-    double * ar = malloc((1+tot)*sizeof(double));
-    for (k=1; k<= tot; k++) {
-        ia[k] = rint(AT(c,k-1+n,0));
-        ja[k] = rint(AT(c,k-1+n,1));
-        ar[k] =      AT(c,k-1+n,2);
-        //printf("%d %d %f\n",ia[k],ja[k],ar[k]);
-    }
-    glp_load_matrix(lp, tot, ia, ja, ar);
-    int t;
-    for (i=1;i<=m;i++) {
-    switch((int)rint(AT(b,i-1,0))) {
-        case 0: { t = GLP_FR; break; }
-        case 1: { t = GLP_LO; break; }
-        case 2: { t = GLP_UP; break; }
-        case 3: { t = GLP_DB; break; }
-       default: { t = GLP_FX; break; }
-    }
-    glp_set_row_bnds(lp, i, t , AT(b,i-1,1), AT(b,i-1,2));
-    }
-    for (j=1;j<=n;j++) {
-    switch((int)rint(AT(b,m+j-1,0))) {
-        case 0: { t = GLP_FR; break; }
-        case 1: { t = GLP_LO; break; }
-        case 2: { t = GLP_UP; break; }
-        case 3: { t = GLP_DB; break; }
-       default: { t = GLP_FX; break; }
-    }
-    glp_set_col_bnds(lp, j, t , AT(b,m+j-1,1), AT(b,m+j-1,2));
-    }
-    glp_term_out(0);
-    glp_simplex(lp, NULL);
-    sp[0] = glp_get_status(lp);
-    sp[1] = glp_get_obj_val(lp);
-    for (k=1; k<=n; k++) {
-        sp[k+1] = glp_get_col_prim(lp, k);
-    }
-    glp_delete_prob(lp);
-    free(ia);
-    free(ja);
-    free(ar);
-    return 0;
-}
author	Alberto Ruiz <aruiz@um.es>	2015-04-09 12:48:57 +0200
committer	Alberto Ruiz <aruiz@um.es>	2015-04-09 12:48:57 +0200
commit	c10f27ac40ff74612a6c773baa572573f3186506 (patch)
tree	efe9bf1b62e20c1163eed98753c4bef2afca6d06 /packages/glpk/src/C
parent	5eba1bc309d7845366e8d00849d85426bf8f666d (diff)
parent	8d7c921bdff0d57a4579d3de71cd5ba3bf5276a1 (diff)

diff --git a/packages/glpk/src/C/glpk.c b/packages/glpk/src/C/glpk.c index bfbb435..86b1277 100644 --- a/packages/glpk/src/C/glpk.c +++ b/packages/glpk/src/C/glpk.c
@@ -10,67 +10,71 @@
10		10
11	/-----------------------------------------------------/	11	/-----------------------------------------------------/
12		12
13	int c_simplex_sparse(int m, int n, DMAT(c), DMAT(b), DVEC(s)) {	13	#define C_X_SPARSE(X) \
14	glp_prob *lp;	14	int c_##X##_sparse(int m, int n, DMAT(c), DMAT(b), DVEC(s)) { \
15	lp = glp_create_prob();	15	glp_prob *lp; \
16	glp_set_obj_dir(lp, GLP_MAX);	16	lp = glp_create_prob(); \
17	int i,j,k;	17	glp_set_obj_dir(lp, GLP_MAX); \
18	int tot = cr - n;	18	int i,j,k; \
19	glp_add_rows(lp, m);	19	int tot = cr - n; \
20	glp_add_cols(lp, n);	20	glp_add_rows(lp, m); \
		21	glp_add_cols(lp, n); \
		22	\
		23	/printf("%d %d\n",m,n);/ \
		24	\
		25	/* the first n values */ \
		26	for (k=1;k<=n;k++) { \
		27	glp_set_obj_coef(lp, k, AT(c, k-1, 2)); \
		28	/printf("%d %f\n",k,AT(c, k-1, 2)); / \
		29	} \
		30	\
		31	int * ia = malloc((1+tot)*sizeof(int)); \
		32	int * ja = malloc((1+tot)*sizeof(int)); \
		33	double * ar = malloc((1+tot)*sizeof(double)); \
		34	\
		35	for (k=1; k<= tot; k++) { \
		36	ia[k] = rint(AT(c,k-1+n,0)); \
		37	ja[k] = rint(AT(c,k-1+n,1)); \
		38	ar[k] = AT(c,k-1+n,2); \
		39	/printf("%d %d %f\n",ia[k],ja[k],ar[k]);/ \
		40	} \
		41	glp_load_matrix(lp, tot, ia, ja, ar); \
		42	\
		43	int t; \
		44	for (i=1;i<=m;i++) { \
		45	switch((int)rint(AT(b,i-1,0))) { \
		46	case 0: { t = GLP_FR; break; } \
		47	case 1: { t = GLP_LO; break; } \
		48	case 2: { t = GLP_UP; break; } \
		49	case 3: { t = GLP_DB; break; } \
		50	default: { t = GLP_FX; break; } \
		51	} \
		52	glp_set_row_bnds(lp, i, t , AT(b,i-1,1), AT(b,i-1,2)); \
		53	} \
		54	for (j=1;j<=n;j++) { \
		55	switch((int)rint(AT(b,m+j-1,0))) { \
		56	case 0: { t = GLP_FR; break; } \
		57	case 1: { t = GLP_LO; break; } \
		58	case 2: { t = GLP_UP; break; } \
		59	case 3: { t = GLP_DB; break; } \
		60	default: { t = GLP_FX; break; } \
		61	} \
		62	glp_set_col_bnds(lp, j, t , AT(b,m+j-1,1), AT(b,m+j-1,2)); \
		63	} \
		64	glp_term_out(0); \
		65	glp_##X(lp, NULL); \
		66	sp[0] = glp_get_status(lp); \
		67	sp[1] = glp_get_obj_val(lp); \
		68	for (k=1; k<=n; k++) { \
		69	sp[k+1] = glp_get_col_prim(lp, k); \
		70	} \
		71	glp_delete_prob(lp); \
		72	free(ia); \
		73	free(ja); \
		74	free(ar); \
		75	\
		76	return 0; \
		77	} \
21		78
22	//printf("%d %d\n",m,n);	79	C_X_SPARSE(simplex);
23		80	C_X_SPARSE(exact);
24	// the first n values
25	for (k=1;k<=n;k++) {
26	glp_set_obj_coef(lp, k, AT(c, k-1, 2));
27	//printf("%d %f\n",k,AT(c, k-1, 2));
28	}
29
30	int * ia = malloc((1+tot)*sizeof(int));
31	int * ja = malloc((1+tot)*sizeof(int));
32	double * ar = malloc((1+tot)*sizeof(double));
33
34	for (k=1; k<= tot; k++) {
35	ia[k] = rint(AT(c,k-1+n,0));
36	ja[k] = rint(AT(c,k-1+n,1));
37	ar[k] = AT(c,k-1+n,2);
38	//printf("%d %d %f\n",ia[k],ja[k],ar[k]);
39	}
40	glp_load_matrix(lp, tot, ia, ja, ar);
41
42	int t;
43	for (i=1;i<=m;i++) {
44	switch((int)rint(AT(b,i-1,0))) {
45	case 0: { t = GLP_FR; break; }
46	case 1: { t = GLP_LO; break; }
47	case 2: { t = GLP_UP; break; }
48	case 3: { t = GLP_DB; break; }
49	default: { t = GLP_FX; break; }
50	}
51	glp_set_row_bnds(lp, i, t , AT(b,i-1,1), AT(b,i-1,2));
52	}
53	for (j=1;j<=n;j++) {
54	switch((int)rint(AT(b,m+j-1,0))) {
55	case 0: { t = GLP_FR; break; }
56	case 1: { t = GLP_LO; break; }
57	case 2: { t = GLP_UP; break; }
58	case 3: { t = GLP_DB; break; }
59	default: { t = GLP_FX; break; }
60	}
61	glp_set_col_bnds(lp, j, t , AT(b,m+j-1,1), AT(b,m+j-1,2));
62	}
63	glp_term_out(0);
64	glp_simplex(lp, NULL);
65	sp[0] = glp_get_status(lp);
66	sp[1] = glp_get_obj_val(lp);
67	for (k=1; k<=n; k++) {
68	sp[k+1] = glp_get_col_prim(lp, k);
69	}
70	glp_delete_prob(lp);
71	free(ia);
72	free(ja);
73	free(ar);
74
75	return 0;
76	}