diff options
| author | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-08 15:10:33 +0000 |
|---|---|---|
| committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-03-08 15:10:33 +0000 |
| commit | 6419502e4bb83f53caf9f3fd5170f8219516e38a (patch) | |
| tree | 218bd10263a04771fc651492bf1499b6c0558d00 /src/ats | |
| parent | 6eb80c519a4cc9bda361ef0d9742c8b2c21e7c50 (diff) | |
| download | gnunet-6419502e4bb83f53caf9f3fd5170f8219516e38a.tar.gz gnunet-6419502e4bb83f53caf9f3fd5170f8219516e38a.zip | |
address specific names
Diffstat (limited to 'src/ats')
| -rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index f8ac71bca..cf4570163 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c | |||
| @@ -525,7 +525,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC | |||
| 525 | mlpi->r_q[0] = 0; | 525 | mlpi->r_q[0] = 0; |
| 526 | 526 | ||
| 527 | /* Add bandwidth column */ | 527 | /* Add bandwidth column */ |
| 528 | GNUNET_asprintf (&name, "b_%s_%s", GNUNET_i2s (&address->peer), address->plugin); | 528 | GNUNET_asprintf (&name, "b_%s_%s_%p", GNUNET_i2s (&address->peer), address->plugin, address); |
| 529 | #if TEST_MAX_BW_ASSIGNMENT | 529 | #if TEST_MAX_BW_ASSIGNMENT |
| 530 | mlpi->c_b = mlp_create_problem_create_column (p, name, GLP_CV, GLP_LO, 0.0, 0.0, 1.0); | 530 | mlpi->c_b = mlp_create_problem_create_column (p, name, GLP_CV, GLP_LO, 0.0, 0.0, 1.0); |
| 531 | #else | 531 | #else |
| @@ -535,7 +535,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC | |||
| 535 | GNUNET_free (name); | 535 | GNUNET_free (name); |
| 536 | 536 | ||
| 537 | /* Add usage column */ | 537 | /* Add usage column */ |
| 538 | GNUNET_asprintf (&name, "n_%s_%s", GNUNET_i2s (&address->peer), address->plugin); | 538 | GNUNET_asprintf (&name, "n_%s_%s_%p", GNUNET_i2s (&address->peer), address->plugin, address); |
| 539 | mlpi->c_n = mlp_create_problem_create_column (p, name, GLP_IV, GLP_DB, 0.0, 1.0, 0.0); | 539 | mlpi->c_n = mlp_create_problem_create_column (p, name, GLP_IV, GLP_DB, 0.0, 1.0, 0.0); |
| 540 | GNUNET_free (name); | 540 | GNUNET_free (name); |
| 541 | 541 | ||
| @@ -543,7 +543,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC | |||
| 543 | /* Add constraint c1) bandwidth capping | 543 | /* Add constraint c1) bandwidth capping |
| 544 | * b_t + (-M) * n_t <= 0 | 544 | * b_t + (-M) * n_t <= 0 |
| 545 | * */ | 545 | * */ |
| 546 | GNUNET_asprintf(&name, "c1_%s_%s", GNUNET_i2s(&address->peer), address->plugin); | 546 | GNUNET_asprintf(&name, "c1_%s_%s_%p", GNUNET_i2s(&address->peer), address->plugin, address); |
| 547 | mlpi->r_c1 = mlp_create_problem_create_constraint (p, name, GLP_UP, 0.0, 0.0); | 547 | mlpi->r_c1 = mlp_create_problem_create_constraint (p, name, GLP_UP, 0.0, 0.0); |
| 548 | GNUNET_free (name); | 548 | GNUNET_free (name); |
| 549 | 549 | ||
| @@ -555,7 +555,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC | |||
| 555 | /* Add constraint c 3) minimum bandwidth | 555 | /* Add constraint c 3) minimum bandwidth |
| 556 | * b_t + (-n_t * b_min) >= 0 | 556 | * b_t + (-n_t * b_min) >= 0 |
| 557 | * */ | 557 | * */ |
| 558 | GNUNET_asprintf(&name, "c3_%s_%s", GNUNET_i2s(&address->peer), address->plugin); | 558 | GNUNET_asprintf(&name, "c3_%s_%s_%p", GNUNET_i2s(&address->peer), address->plugin, address); |
| 559 | mlpi->r_c3 = mlp_create_problem_create_constraint (p, name, GLP_LO, 0.0, 0.0); | 559 | mlpi->r_c3 = mlp_create_problem_create_constraint (p, name, GLP_LO, 0.0, 0.0); |
| 560 | GNUNET_free (name); | 560 | GNUNET_free (name); |
| 561 | 561 | ||