restructuration du project

2019-10-22 19:30:27 +02:00
parent 347da4f10d
commit 3f980f1d09
7 changed files with 127 additions and 82 deletions
--- a/src/master.c
+++ b/src/master.c
@ -0,0 +1,104 @@
+#include "master.h"
+
+#include <stdio.h>		/* C input/output                       */
+#include <stdlib.h>		/* C standard library                   */
+#include <glpk.h>		/* GNU GLPK linear/mixed integer solver */
+#include <string.h>
+
+#include "sub.h"
+
+
+int col_num = 1;
+int num_col_sp = 1;
+
+
+static void add_column(glp_prob *lp, float coef) {
+	glp_add_cols(lp, 1);
+	char name[10] = "";
+	snprintf(name, sizeof name, "rouleau%d", col_num);
+	glp_set_col_name(lp, col_num, name);
+	glp_set_col_bnds(lp, col_num, GLP_LO, 0.0, 0.0);
+	glp_set_obj_coef(lp, col_num, coef);
+
+	col_num++;
+}
+
+int perfect_rolls() {
+	/* declare variables */
+	glp_prob *lp;
+	int ia[1 + 1000] = {0}, ja[1 + 1000] = {0};
+	double ar[1 + 1000] = {0}, z, x1, x2, x3, x4;
+	/* create problem */
+	lp = glp_create_prob();
+	glp_set_prob_name(lp, "rouleaux-parfaits");
+	glp_set_obj_dir(lp, GLP_MIN);
+	/* fill problem */
+	glp_add_rows(lp, 4);
+
+	char name[8] = "";
+	const double bounds[4] = {97, 610, 395, 211};
+	for (int i = 1; i < 5; i++) {
+		snprintf(name, sizeof name, "taille%d", i);
+		glp_set_row_name(lp, 1, name);
+		glp_set_row_bnds(lp, 1, GLP_LO,  bounds[i-1], 0.0);
+		add_column(lp, 1.0);
+		ia[i] = i;
+		ja[i] = i;
+		ar[i] = 1;
+	}
+
+	int nb_coeffs = 4;
+	double y1, y2, y3, y4;
+	int a[4] = {0};
+	while (1) {
+		/* printf("nb_coeffs=%d\n", nb_coeffs); */
+		/* for (int i = 0; i < nb_coeffs + 4; i++) { */
+		/* 	printf("ar[%d]=%g\n", i, ar[i]); */
+		/* } */
+		/* printf("\n"); */
+
+		glp_load_matrix(lp, nb_coeffs, ia, ja, ar);
+		printf("col_num=%d\n", col_num);
+
+		/* solve problem */
+		glp_prob *tmp_prob = glp_create_prob();
+		glp_copy_prob(tmp_prob, lp, GLP_ON);
+		glp_simplex(tmp_prob, NULL);
+		y1 = glp_get_row_dual(tmp_prob, 1);
+		y2 = glp_get_row_dual(tmp_prob, 2);
+		y3 = glp_get_row_dual(tmp_prob, 3);
+		y4 = glp_get_row_dual(tmp_prob, 4);
+
+		column_generator(y1, y2, y3, y4, a, num_col_sp);
+		if (a[0] > 1) {
+			/* for (int i = 1; i <= 4; i++) { */
+			/* 	printf("a[%d]=%d\n", i, a[i]); */
+			/* } */
+			add_column(lp, 1.0);
+			for (int i = 1; i < 5; i++) {
+				/* a[col_num, i] = a[i] */
+				nb_coeffs++;
+				ia[nb_coeffs] = i;
+				ja[nb_coeffs] = col_num-1;
+				ar[nb_coeffs] = a[i];
+			}
+		}
+		else {
+			break;
+		}
+	}
+
+	/* recover and display results */
+	z = glp_get_obj_val(lp);
+	x1 = glp_get_col_prim(lp, 1);
+	x2 = glp_get_col_prim(lp, 2);
+	x3 = glp_get_col_prim(lp, 3);
+	x4 = glp_get_col_prim(lp, 4);
+	printf("z = %g; x1 = %g; x2 = %g; x3 = %g; x4 = %g\n", z, x1, x2, x3, x4);
+
+	/* housekeeping */
+	glp_delete_prob(lp);
+	glp_free_env();
+
+	return z;
+}