From 4ce5fedc816ac216fe35db80c6c5f5c903994d8b Mon Sep 17 00:00:00 2001 From: velho Date: Wed, 9 May 2007 12:27:35 +0000 Subject: [PATCH 1/1] Here we go again. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3494 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/surf/simeng_usage.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/testsuite/surf/simeng_usage.c b/testsuite/surf/simeng_usage.c index 4f8942b203..b9aaebf22d 100644 --- a/testsuite/surf/simeng_usage.c +++ b/testsuite/surf/simeng_usage.c @@ -13,6 +13,7 @@ #include "xbt/sysdep.h" #include "surf/maxmin.h" +#include "surf/maxmin_private.h" #include "xbt/log.h" #include "xbt/module.h" @@ -88,15 +89,6 @@ void test1(method_t method) PRINT_VAR(R_1); PRINT_VAR(R_2); PRINT_VAR(R_3); -/* DEBUG0("\n"); */ - -/* lmm_update_variable_weight(Sys,R_1_2_3,.5); */ -/* lmm_solve(Sys); */ - -/* PRINT_VAR(R_1_2_3); */ -/* PRINT_VAR(R_1); */ -/* PRINT_VAR(R_2); */ -/* PRINT_VAR(R_3); */ lmm_system_free(Sys); } @@ -159,7 +151,7 @@ void test3(method_t method) lmm_system_t Sys = NULL ; lmm_constraint_t *tmp_cnst = NULL; lmm_variable_t *tmp_var = NULL; - char tmp_name[13]; + char **tmp_name; /*array to add the the constraints of fictiv variables */ @@ -252,14 +244,20 @@ void test3(method_t method) Sys = lmm_system_new(); + + + tmp_name = (char **) calloc(31, sizeof(char *)); + for(i=0; i<31; i++){ + tmp_name[i] = (char *) calloc(10, sizeof(char)); + } /* * Creates the constraints */ tmp_cnst = calloc(15, sizeof(lmm_constraint_t)); for(i=0; i<15; i++){ - sprintf(tmp_name, "C_%03d", i); - tmp_cnst[i] = lmm_constraint_new(Sys, (void *) tmp_name, B[i]); + sprintf(tmp_name[i], "C_%03d", i); + tmp_cnst[i] = lmm_constraint_new(Sys, (void *) tmp_name[i], B[i]); } @@ -268,8 +266,8 @@ void test3(method_t method) */ tmp_var = calloc(16, sizeof(lmm_variable_t)); for(j=0; j<16; j++){ - sprintf(tmp_name, "X_%03d", j); - tmp_var[j] = lmm_variable_new(Sys, (void *) tmp_name, 1.0, -1.0 , 15); + sprintf(tmp_name[i+j], "X_%03d", j); + tmp_var[j] = lmm_variable_new(Sys, (void *) tmp_name[i+j], 1.0, -1.0 , 15); } /* @@ -283,6 +281,10 @@ void test3(method_t method) } } + + lmm_print(Sys); + + for(j=0; j<16; j++){ PRINT_VAR(tmp_var[j]); } @@ -304,6 +306,7 @@ void test3(method_t method) free(tmp_var); free(tmp_cnst); + free(tmp_name); lmm_system_free(Sys); } @@ -335,7 +338,6 @@ int main(int argc, char **argv) /* test2(LAGRANGE); */ - /* DEBUG0("***** Test 3 (Max-Min) ***** \n"); */ /* test3(MAXMIN); */ #ifdef HAVE_SDP -- 2.20.1