X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fperf_ats_solver.c;h=6fbf547ac2f6a0218a407f72aaf8a01dc2f91a11;hb=a35ab677ed4396f271cfd3fea2051044a6a8b5d7;hp=7d29e4b64ea7796faac1b2cbee1d12b702b18abb;hpb=104c0773ca81e2435d8c973517db23386188bdc0;p=oweals%2Fgnunet.git

diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 7d29e4b64..6fbf547ac 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -38,47 +38,6 @@
 #define DEFAULT_ADDRESSES       10
 #define DEFAULT_ATS_COUNT       2
 
-#define GNUPLOT_PROP_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time Proportional solver  \" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
-
-#define GNUPLOT_PROP_UPDATE_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time Proportional solver with updated problem\" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
-
-#define GNUPLOT_MLP_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time MLP solver \" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
-
-#define GNUPLOT_MLP_UPDATE_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time MLP solver with updated problem\" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
-
-#define GNUPLOT_RIL_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time RIL solver \" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
-
-#define GNUPLOT_RIL_UPDATE_TEMPLATE "#!/usr/bin/gnuplot \n" \
-"set datafile separator ';' \n" \
-"set title \"Execution time RIL solver with updated problem\" \n" \
-"set xlabel \"Number of peers\" \n" \
-"set ylabel \"Execution time in us\" \n" \
-"set grid \n"
 
 /**
  * Handle for ATS address component
@@ -115,16 +74,6 @@ struct PerfHandle
    */
   struct Iteration *iterations_results;
 
-  /**
-   * Array to store averaged full solution result with length #peers
-   */
-  struct Result *averaged_full_result;
-
-  /**
-   * Array to store averaged updated solution result with length #peers
-   */
-  struct Result *averaged_update_result;
-
   /**
    * The current result
    */
@@ -173,7 +122,7 @@ struct PerfHandle
   /**
    * Create gnuplot file
    */
-  int create_plot;
+  int create_datafile;
 
   /**
    * Measure updates
@@ -211,15 +160,9 @@ struct PerfHandle
  */
 struct Iteration
 {
-  /**
-   * Head of the linked list
-   */
-  struct Result *result_head;
+  struct Result **results_array;
 
-  /**
-   * Tail of the linked list
-   */
-  struct Result *result_tail;
+  struct Result **update_results_array;
 };
 
 
@@ -266,24 +209,24 @@ struct Result
   /**
    * Duration of setting up the problem in the solver
    */
-  struct GNUNET_TIME_Relative d_setup;
+  struct GNUNET_TIME_Relative d_setup_full;
 
   /**
    * Duration of solving the LP problem in the solver
    * MLP solver only
    */
-  struct GNUNET_TIME_Relative d_lp;
+  struct GNUNET_TIME_Relative d_lp_full;
 
   /**
    * Duration of solving the MLP problem in the solver
    * MLP solver only
    */
-  struct GNUNET_TIME_Relative d_mlp;
+  struct GNUNET_TIME_Relative d_mlp_full;
 
   /**
    * Duration of solving whole problem in the solver
    */
-  struct GNUNET_TIME_Relative d_total;
+  struct GNUNET_TIME_Relative d_total_full;
 
   /**
    * Start time of setting up the problem in the solver
@@ -377,8 +320,6 @@ end_now (int res)
 
   GNUNET_free_non_null (ph.peers);
   GNUNET_free_non_null (ph.iterations_results);
-  GNUNET_free_non_null (ph.averaged_full_result);
-  GNUNET_free_non_null (ph.averaged_update_result);
 
   GAS_normalization_stop ();
   ret = res;
@@ -410,29 +351,36 @@ static void
 perf_update_address (struct ATS_Address *cur)
 {
   int r_type;
-  int r_val;
+  int abs_val;
+  double rel_val;
 
   r_type = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 2);
   switch (r_type)
   {
   case 0:
-    r_val = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-        "Updating peer `%s' address %p type %s val %u\n",
-        GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DELAY", r_val);
+    abs_val = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
+    rel_val = (100 + (double) abs_val) / 100;
+
+    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+        "Updating peer `%s' address %p type %s abs val %u rel val %.3f\n",
+        GNUNET_i2s (&cur->peer), cur,
+        "GNUNET_ATS_QUALITY_NET_DELAY",
+        abs_val, rel_val);
     ph.env.sf.s_address_update_property (ph.solver, cur,
         GNUNET_ATS_QUALITY_NET_DELAY,
-        r_val, (double) (100 + r_val / 100));
+        abs_val, rel_val);
     break;
   case 1:
-    r_val = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 10);
+    abs_val = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 10);
+    rel_val = (100 + (double) abs_val) / 100;
 
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-        "Updating peer `%s' address %p type %s val %u\n",
-        GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DISTANCE", r_val);
+    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+        "Updating peer `%s' address %p type %s abs val %u rel val %.3f\n",
+        GNUNET_i2s (&cur->peer), cur, "GNUNET_ATS_QUALITY_NET_DISTANCE",
+        abs_val, rel_val);
     ph.env.sf.s_address_update_property (ph.solver, cur,
         GNUNET_ATS_QUALITY_NET_DISTANCE,
-        r_val, (double) (100 + r_val) / 100);
+        abs_val, rel_val);
     break;
   default:
     break;
@@ -445,16 +393,15 @@ static void
 bandwidth_changed_cb (void *cls,
                       struct ATS_Address *address)
 {
-  if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
-       (0 == ntohl (address->assigned_bw_in.value__)) )
+  if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) )
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
               GNUNET_i2s (&address->peer),
               address,
-              (unsigned int) ntohl (address->assigned_bw_out.value__),
-              (unsigned int) ntohl (address->assigned_bw_in.value__));
+              address->assigned_bw_out,
+              address->assigned_bw_in);
   if (GNUNET_YES == ph.bulk_running)
     GNUNET_break (0);
   return;
@@ -486,15 +433,21 @@ perf_address_initial_update (void *solver,
     struct GNUNET_CONTAINER_MultiPeerMap * addresses,
     struct ATS_Address *address)
 {
+  double delay;
+  double distance;
+  uint32_t random = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
+  delay = (100 + (double) random) / 100;
   ph.env.sf.s_address_update_property (solver, address, GNUNET_ATS_QUALITY_NET_DELAY,
-      100,
-      (double) (100 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100))
-          / 100);
+      100,  delay);
+
+  random = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
+  distance = (100 + (double) random) / 100;
 
   ph.env.sf.s_address_update_property (solver, address,
-      GNUNET_ATS_QUALITY_NET_DISTANCE, 10,
-      (double) (100 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100))
-          / 100);
+      GNUNET_ATS_QUALITY_NET_DISTANCE, 10, distance);
+
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+      "Initial update address %p : %.2f  %.2f\n", address, delay, distance);
 }
 
 /**
@@ -627,18 +580,28 @@ solver_info_cb (void *cls,
 
       if ((GAS_STAT_SUCCESS == stat) && (NULL == ph.current_result))
       {
-        /* Create new result */
         tmp = GNUNET_new (struct Result);
-        ph.current_result = tmp;
-        GNUNET_CONTAINER_DLL_insert_tail(ph.iterations_results[ph.current_iteration-1].result_head,
-            ph.iterations_results[ph.current_iteration-1].result_tail, tmp);
+        /* Create new result */
+        if ((add == GAS_INFO_UPDATED) || (GNUNET_YES == ph.performed_update))
+        {
+          ph.current_result = tmp;
+          //fprintf (stderr,"UPDATE %u %u\n",ph.current_iteration-1, ph.current_p);
+          ph.iterations_results[ph.current_iteration-1].update_results_array[ph.current_p] = tmp;
+        }
+        else
+        {
+          ph.current_result = tmp;
+          //fprintf (stderr,"FULL %u %u\n",ph.current_iteration-1, ph.current_p);
+          ph.iterations_results[ph.current_iteration-1].results_array[ph.current_p] = tmp;
+        }
+
         ph.current_result->addresses = ph.current_a;
         ph.current_result->peers = ph.current_p;
         ph.current_result->s_total = GNUNET_TIME_absolute_get();
-        ph.current_result->d_total = GNUNET_TIME_UNIT_FOREVER_REL;
-        ph.current_result->d_setup = GNUNET_TIME_UNIT_FOREVER_REL;
-        ph.current_result->d_lp = GNUNET_TIME_UNIT_FOREVER_REL;
-        ph.current_result->d_mlp = GNUNET_TIME_UNIT_FOREVER_REL;
+        ph.current_result->d_total_full = GNUNET_TIME_UNIT_FOREVER_REL;
+        ph.current_result->d_setup_full = GNUNET_TIME_UNIT_FOREVER_REL;
+        ph.current_result->d_lp_full = GNUNET_TIME_UNIT_FOREVER_REL;
+        ph.current_result->d_mlp_full = GNUNET_TIME_UNIT_FOREVER_REL;
         ph.current_result->info = add;
         if ((add == GAS_INFO_UPDATED) || (GNUNET_YES == ph.performed_update))
         {
@@ -653,7 +616,7 @@ solver_info_cb (void *cls,
       return;
     case GAS_OP_SOLVE_STOP:
       GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_STOP",
+          "Solver notifies `%s' with result `%s', `%s'\n", "GAS_OP_SOLVE_STOP",
           (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
       if ((GNUNET_NO == ph.expecting_solution) || (NULL == ph.current_result))
       {
@@ -671,7 +634,7 @@ solver_info_cb (void *cls,
       {
         /* Finalize result */
         ph.current_result->e_total = GNUNET_TIME_absolute_get ();
-        ph.current_result->d_total = GNUNET_TIME_absolute_get_difference (
+        ph.current_result->d_total_full = GNUNET_TIME_absolute_get_difference (
             ph.current_result->s_total, ph.current_result->e_total);
       }
       ph.current_result = NULL;
@@ -711,7 +674,7 @@ solver_info_cb (void *cls,
         ph.current_result->valid = GNUNET_NO;
 
       ph.current_result->e_setup = GNUNET_TIME_absolute_get ();
-      ph.current_result->d_setup = GNUNET_TIME_absolute_get_difference (
+      ph.current_result->d_setup_full = GNUNET_TIME_absolute_get_difference (
           ph.current_result->s_setup, ph.current_result->e_setup);
       return;
 
@@ -748,7 +711,7 @@ solver_info_cb (void *cls,
         ph.current_result->valid = GNUNET_NO;
 
       ph.current_result->e_lp = GNUNET_TIME_absolute_get ();
-      ph.current_result->d_lp = GNUNET_TIME_absolute_get_difference (
+      ph.current_result->d_lp_full = GNUNET_TIME_absolute_get_difference (
           ph.current_result->s_lp, ph.current_result->e_lp);
       return;
 
@@ -785,7 +748,7 @@ solver_info_cb (void *cls,
         ph.current_result->valid = GNUNET_NO;
 
       ph.current_result->e_mlp = GNUNET_TIME_absolute_get ();
-      ph.current_result->d_mlp = GNUNET_TIME_absolute_get_difference (
+      ph.current_result->d_mlp_full = GNUNET_TIME_absolute_get_difference (
       ph.current_result->s_mlp, ph.current_result->e_mlp);
       return;
     case GAS_OP_SOLVE_UPDATE_NOTIFICATION_START:
@@ -810,122 +773,6 @@ solver_info_cb (void *cls,
     }
 }
 
-static void
-write_gnuplot_script (char * data_fn, int iteration, int full)
-{
-  struct GNUNET_DISK_FileHandle *f;
-  char * gfn;
-  char *data;
-  char *iter_text;
-  char *template;
-
-  /* Write header */
-  switch (ph.ats_mode) {
-    case MODE_PROPORTIONAL:
-      if (GNUNET_YES == full)
-        template = GNUPLOT_PROP_TEMPLATE;
-      else
-        template = GNUPLOT_PROP_UPDATE_TEMPLATE;
-      break;
-    case MODE_MLP:
-      if (GNUNET_YES == full)
-        template = GNUPLOT_MLP_TEMPLATE;
-      else
-        template = GNUPLOT_MLP_UPDATE_TEMPLATE;
-      break;
-    case MODE_RIL:
-      if (GNUNET_YES == full)
-        template = GNUPLOT_RIL_TEMPLATE;
-      else
-        template = GNUPLOT_RIL_UPDATE_TEMPLATE;
-      break;
-    default:
-      GNUNET_break (0);
-      return;
-  }
-  if (-1 == iteration)
-    GNUNET_asprintf (&iter_text, "%s_%u", "avg",ph.total_iterations);
-  else
-    GNUNET_asprintf (&iter_text, "%u", iteration);
-  if (GNUNET_YES == full)
-  {
-    GNUNET_asprintf (&gfn, "perf_%s_full_%s-%u_%u_%u.gnuplot",
-        ph.ats_string,
-        iter_text,
-        ph.N_peers_start,
-        ph.N_peers_end,
-        ph.N_address);
-  }
-  else
-  {
-    GNUNET_asprintf (&gfn, "perf_%s_updat_%s-%u_%u_%u.gnuplot",
-        ph.ats_string,
-        iter_text,
-        ph.N_peers_start,
-        ph.N_peers_end,
-        ph.N_address);
-  }
-  GNUNET_free (iter_text);
-
-  f = GNUNET_DISK_file_open (gfn,
-      GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
-      GNUNET_DISK_PERM_USER_EXEC | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-  if (NULL == f)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot open gnuplot file `%s'\n", gfn);
-    GNUNET_free (gfn);
-    return;
-  }
-
-  if (GNUNET_SYSERR == GNUNET_DISK_file_write(f, template, strlen(template)))
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot write data to plot file `%s'\n", gfn);
-
-  data = NULL;
-  if (MODE_PROPORTIONAL == ph.ats_mode)
-  {
-    GNUNET_asprintf (&data, "plot '%s' using 1:%u with lines title 'Total time to solve'\n" \
-                           "pause -1",
-                           data_fn, 3);
-  }
-  else if (MODE_MLP == ph.ats_mode)
-  {
-    GNUNET_asprintf (&data, "plot '%s' using 1:%u with lines title 'Total time to solve',\\\n" \
-                            "'%s' using 1:%u with lines title 'Time to setup',\\\n"
-                            "'%s' using 1:%u with lines title 'Time to solve LP',\\\n"
-                            "'%s' using 1:%u with lines title 'Total time to solve MLP'\n" \
-                            "pause -1",
-                           data_fn, 3,
-                           data_fn, 4,
-                           data_fn, 5,
-                           data_fn, 6);
-  }
-  else if (MODE_RIL == ph.ats_mode)
-  {
-    GNUNET_asprintf (&data,
-                     "plot '%s' using 1:%u with lines title 'Total time to solve'\n" \
-                     "pause -1",
-                     data_fn, 3);
-  }
-
-  if ((NULL != data) &&
-      (GNUNET_SYSERR == GNUNET_DISK_file_write (f, data, strlen(data))))
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Cannot write data to plot file `%s'\n",
-                gfn);
-  GNUNET_free_non_null (data);
-
-  if (GNUNET_SYSERR == GNUNET_DISK_file_close(f))
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Cannot close gnuplot file `%s'\n",
-                gfn);
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Data successfully written to plot file `%s'\n",
-                gfn);
-  GNUNET_free (gfn);
-
-}
-
 /**
  * Evaluate results for a specific iteration
  *
@@ -934,115 +781,21 @@ write_gnuplot_script (char * data_fn, int iteration, int full)
 static void
 evaluate (int iteration)
 {
-  struct GNUNET_DISK_FileHandle *f_full;
-  struct GNUNET_DISK_FileHandle *f_update;
-  char * data_fn_full;
-  char * data_fn_update;
-  char * data;
   struct Result *cur;
-  struct Result *next;
-  struct Result *cur_res;
-  char * str_d_total;
-  char * str_d_setup;
-  char * str_d_lp;
-  char * str_d_mlp;
-  char * iter_text;
-
-  f_full = NULL;
-  f_update = NULL;
-
-  data_fn_full = NULL;
-
-  if (ph.create_plot)
-  {
-    if (-1 == iteration)
-      GNUNET_asprintf (&iter_text, "%s", "avg");
-    else
-      GNUNET_asprintf (&iter_text, "%u", iteration);
-    GNUNET_asprintf (&data_fn_full,
-                     "perf_%s_full_%s_%u_%u_%u.data",
-                     ph.ats_string,
-                     iter_text,
-                     ph.N_peers_start,
-                     ph.N_peers_end,
-                     ph.N_address);
-    GNUNET_free (iter_text);
-    f_full = GNUNET_DISK_file_open (data_fn_full,
-        GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
-        GNUNET_DISK_PERM_USER_EXEC | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-    if (NULL == f_full)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot open gnuplot file `%s'\n",
-                  data_fn_full);
-      GNUNET_free (data_fn_full);
-      return;
-    }
-    data = "#peers;addresses;time total in us;#time setup in us;#time lp in us;#time mlp in us;\n";
-    if (GNUNET_SYSERR == GNUNET_DISK_file_write(f_full, data, strlen(data)))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot write data to log file `%s'\n",
-                  data_fn_full);
-    write_gnuplot_script (data_fn_full, iteration, GNUNET_YES);
-  }
-
-  data_fn_update = NULL;
-  if ((ph.create_plot) && (GNUNET_YES == ph.measure_updates))
-  {
-    if (-1 == iteration)
-      GNUNET_asprintf (&iter_text, "%s", "avg");
-    else
-      GNUNET_asprintf (&iter_text, "%u", iteration);
-    GNUNET_asprintf (&data_fn_update, "perf_%s_update_i%u_%u_%u_%u.data",
-        ph.ats_string,
-        iter_text,
-        ph.N_peers_start,
-        ph.N_peers_end,
-        ph.N_address);
-    GNUNET_free (iter_text);
-    f_update = GNUNET_DISK_file_open (data_fn_update,
-        GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
-        GNUNET_DISK_PERM_USER_EXEC | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-    if (NULL == f_update)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot open gnuplot file `%s'\n", data_fn_update);
-      GNUNET_free (data_fn_update);
-      if (NULL != f_full)
-        GNUNET_DISK_file_close (f_full);
-      GNUNET_free (data_fn_full);
-      return;
-    }
-    data = "#peers;addresses;time total in us;#time setup in us;#time lp in us;#time mlp in us;\n";
-    if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_update, data, strlen(data)))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot write data to log file `%s'\n",
-                  data_fn_update);
-    write_gnuplot_script (data_fn_update, iteration, GNUNET_NO);
-  }
+  int cp;
 
-  next = ph.iterations_results[ph.current_iteration -1].result_head;
-  while (NULL != (cur = next))
+  for (cp = ph.N_peers_start; cp <= ph.N_peers_end; cp ++)
   {
-    next = cur->next;
-    str_d_total = NULL;
-    str_d_setup = NULL;
-    str_d_lp = NULL;
-    str_d_mlp = NULL;
-
-    /* Print log */
-    if (GNUNET_NO == cur->update)
-    {
-      cur_res = &ph.averaged_full_result[cur->peers - ph.N_peers_start];
-    }
-    else
+    cur  = ph.iterations_results[ph.current_iteration-1].results_array[cp];
+    if (0 == cp)
+      continue;
+    if (NULL == cur)
     {
-      cur_res = &ph.averaged_update_result[cur->peers - ph.N_peers_start];
+      GNUNET_break (0);
+      fprintf (stderr,
+               "Missing result for %u peers\n", cp);
     }
 
-    cur_res->peers = cur->peers;
-    cur_res->addresses = cur->addresses;
-    cur_res->update = cur->update;
 
     if (GNUNET_NO == cur->valid)
     {
@@ -1052,181 +805,105 @@ evaluate (int iteration)
                cur->peers, cur->addresses, "Failed to solve!");
       continue;
     }
-    else
-      cur_res->valid ++;
 
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_total.rel_value_us)
+
+    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_total_full.rel_value_us)
     {
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == cur_res->d_total.rel_value_us)
-        cur_res->d_total.rel_value_us = 0;
-      if (GNUNET_YES == cur->valid)
-        cur_res->d_total.rel_value_us += cur->d_total.rel_value_us;
       fprintf (stderr,
          "Total time to solve %s for %u peers %u addresses: %llu us\n",
          (GNUNET_YES == cur->update) ? "updated" : "full",
          cur->peers, cur->addresses,
-         (unsigned long long) cur->d_total.rel_value_us);
-      GNUNET_asprintf(&str_d_total,
-         "%llu", (unsigned long long) cur->d_total.rel_value_us);
+         (unsigned long long) cur->d_total_full.rel_value_us);
     }
-    else
-      GNUNET_asprintf(&str_d_total, "-1");
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_setup.rel_value_us)
+
+
+    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_setup_full.rel_value_us)
     {
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == cur_res->d_setup.rel_value_us)
-        cur_res->d_setup.rel_value_us = 0;
-      if (GNUNET_YES == cur->valid)
-        cur_res->d_setup.rel_value_us += cur->d_setup.rel_value_us;
-      fprintf (stderr, "Total time to setup %s %u peers %u addresses: %llu us\n",
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+          "Total time to setup %s %u peers %u addresses: %llu us\n",
           (GNUNET_YES == cur->update) ? "updated" : "full",
           cur->peers, cur->addresses,
-          (unsigned long long) cur->d_setup.rel_value_us);
-      GNUNET_asprintf(&str_d_setup, "%llu",
-          (unsigned long long )cur->d_setup.rel_value_us);
+          (unsigned long long) cur->d_setup_full.rel_value_us);
     }
-    else
-      GNUNET_asprintf(&str_d_setup, "-1");
 
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_lp.rel_value_us)
+    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_lp_full.rel_value_us)
     {
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == cur_res->d_lp.rel_value_us)
-        cur_res->d_lp.rel_value_us = 0;
-      if (GNUNET_YES == cur->valid)
-        cur_res->d_lp.rel_value_us += cur->d_lp.rel_value_us;
-      fprintf (stderr,
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
          "Total time to solve %s LP for %u peers %u addresses: %llu us\n",
          (GNUNET_YES == cur->update) ? "updated" : "full",
          cur->peers,
          cur->addresses,
-         (unsigned long long )cur->d_lp.rel_value_us);
-      GNUNET_asprintf (&str_d_lp,
-          "%llu", (unsigned long long )cur->d_lp.rel_value_us);
+         (unsigned long long )cur->d_lp_full.rel_value_us);
     }
-    else
-      GNUNET_asprintf (&str_d_lp, "-1");
 
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_mlp.rel_value_us)
+    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_mlp_full.rel_value_us)
     {
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == cur_res->d_mlp.rel_value_us)
-        cur_res->d_mlp.rel_value_us = 0;
-      if (GNUNET_YES == cur->valid)
-        cur_res->d_mlp.rel_value_us += cur->d_mlp.rel_value_us;
-
-      fprintf (stderr, "Total time to solve %s MLP for %u peers %u addresses: %llu us\n",
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+          "Total time to solve %s MLP for %u peers %u addresses: %llu us\n",
           (GNUNET_YES == cur->update) ? "updated" : "full",
           cur->peers, cur->addresses,
-          (unsigned long long )cur->d_mlp.rel_value_us);
-      GNUNET_asprintf (&str_d_mlp,
-          "%llu", (unsigned long long )cur->d_mlp.rel_value_us);
-    }
-    else
-      GNUNET_asprintf (&str_d_mlp, "-1");
-
-    data = NULL;
-    if (GNUNET_YES == ph.create_plot)
-    {
-
-      GNUNET_asprintf (&data,
-                       "%u;%u;%s;%s;%s;%s\n",
-                       cur->peers, cur->addresses,
-                       str_d_total,
-                       str_d_setup,
-                       str_d_lp,
-                       str_d_mlp);
-      if (cur->update == GNUNET_NO)
-      {
-        if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_full, data, strlen(data)))
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      "Cannot write data to log file `%s'\n",
-                      data_fn_full);
-      }
-      if ((cur->update == GNUNET_YES) && (NULL != f_update))
-      {
-        if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_update, data, strlen(data)))
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      "Cannot write data to log file `%s'\n",
-                      data_fn_update);
-      }
-      GNUNET_free (data);
+          (unsigned long long )cur->d_mlp_full.rel_value_us);
     }
-    GNUNET_free_non_null (str_d_total);
-    GNUNET_free_non_null (str_d_setup);
-    GNUNET_free_non_null (str_d_lp);
-    GNUNET_free_non_null (str_d_mlp);
-
-    GNUNET_CONTAINER_DLL_remove (ph.iterations_results[ph.current_iteration-1].result_head,
-        ph.iterations_results[ph.current_iteration-1].result_tail, cur);
-    GNUNET_free (cur);
   }
 
-  if ((NULL != f_full) && (GNUNET_SYSERR == GNUNET_DISK_file_close (f_full)))
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
-        data_fn_full);
-  GNUNET_free_non_null (data_fn_full);
-
-  if ((NULL != f_update) && (GNUNET_SYSERR == GNUNET_DISK_file_close (f_update)))
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
-        data_fn_update);
-  GNUNET_free_non_null (data_fn_update);
 }
 
 /**
  * Evaluate average results for all iterations
  */
 static void
-evaluate_average (void)
+write_all_iterations (void)
 {
-  int c_o;
-  int c_i;
+  int c_iteration;
+  int c_peer;
 
   struct GNUNET_DISK_FileHandle *f_full;
   struct GNUNET_DISK_FileHandle *f_update;
-  struct Result *cur;
   char * data_fn_full;
   char * data_fn_update;
   char * data;
-  char * str_d_total;
-  char * str_d_setup;
-  char * str_d_lp;
-  char * str_d_mlp;
 
   f_full = NULL;
   f_update = NULL;
 
   data_fn_full = NULL;
 
-  if (ph.create_plot)
+  if (GNUNET_NO == ph.create_datafile)
+    return;
+
+  GNUNET_asprintf (&data_fn_full,
+                   "perf_%s_full_%u-%u_%u_%u.data",
+                   ph.ats_string,
+                   ph.total_iterations,
+                   ph.N_peers_start,
+                   ph.N_peers_end,
+                   ph.N_address);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Using data file `%s'\n",
+              data_fn_full);
+
+  f_full = GNUNET_DISK_file_open (data_fn_full,
+      GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
+      GNUNET_DISK_PERM_USER_EXEC | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
+  if (NULL == f_full)
   {
-    GNUNET_asprintf (&data_fn_full,
-                     "perf_%s_full_avg_%u-%u_%u_%u.data",
-                     ph.ats_string,
-                     ph.total_iterations,
-                     ph.N_peers_start,
-                     ph.N_peers_end,
-                     ph.N_address);
-    f_full = GNUNET_DISK_file_open (data_fn_full,
-        GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
-        GNUNET_DISK_PERM_USER_EXEC | GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
-    if (NULL == f_full)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot open gnuplot file `%s'\n",
-                  data_fn_full);
-      GNUNET_free (data_fn_full);
-      return;
-    }
-    data = "#peers;addresses;time total in us;#time setup in us;#time lp in us;#time mlp in us;\n";
-    if (GNUNET_SYSERR == GNUNET_DISK_file_write(f_full, data, strlen(data)))
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Cannot write data to log file `%s'\n",
-                  data_fn_full);
-    write_gnuplot_script (data_fn_full, -1, GNUNET_YES);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Cannot open data file `%s'\n",
+                data_fn_full);
+    GNUNET_free (data_fn_full);
+    return;
   }
 
+  data = "#peers;addresses;time total in us;#time setup in us;#time lp in us;#time mlp in us;\n";
+  if (GNUNET_SYSERR == GNUNET_DISK_file_write(f_full, data, strlen(data)))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Cannot write data to log file `%s'\n",
+                data_fn_full);
+
   data_fn_update = NULL;
-  if ((ph.create_plot) && (GNUNET_YES == ph.measure_updates))
+  if (GNUNET_YES == ph.measure_updates)
   {
-    GNUNET_asprintf (&data_fn_update, "perf_%s_update_avg_%u-%u_%u_%u.data",
+    GNUNET_asprintf (&data_fn_update, "perf_%s_update_%u-%u_%u_%u.data",
         ph.ats_string,
         ph.total_iterations,
         ph.N_peers_start,
@@ -1245,141 +922,97 @@ evaluate_average (void)
       GNUNET_free (data_fn_full);
       return;
     }
+
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Using update data file `%s'\n",
+                data_fn_update);
+
     data = "#peers;addresses;time total in us;#time setup in us;#time lp in us;#time mlp in us;\n";
     if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_update, data, strlen(data)))
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Cannot write data to log file `%s'\n",
                   data_fn_update);
-    write_gnuplot_script (data_fn_update, -1, GNUNET_NO);
   }
 
-  for (c_o = 0; c_o < 2; c_o++)
+  for (c_peer = ph.N_peers_start; c_peer <= ph.N_peers_end; c_peer ++)
   {
-    if (0 == c_o)
-      fprintf (stderr,
-          "Duration for a full solution averaged over %i iterations\n",
-          ph.total_iterations);
-    if (1 == c_o)
-      fprintf (stderr,
-          "Duration for a full solution averaged over %i iterations\n",
-          ph.total_iterations);
-
-    for (c_i = 0; c_i <= ph.N_peers_end - ph.N_peers_start; c_i++)
+    char * data_str;
+    char * data_tmp;
+    char * data_upd_str;
+    char * data_upd_tmp;
+    GNUNET_asprintf(&data_str, "%u;%u",c_peer, ph.N_address);
+    if (ph.measure_updates)
+      GNUNET_asprintf(&data_upd_str, "%u;%u",c_peer, ph.N_address);
+    for (c_iteration = 0; c_iteration < ph.total_iterations; c_iteration ++)
     {
-      if (0 == c_o)
-      {
-        cur = &ph.averaged_full_result[c_i];
-      }
-      else if ((GNUNET_YES == ph.measure_updates) && (1 == c_o))
-      {
-        cur = &ph.averaged_update_result[c_i];
-      }
-      else
-         break;
+      struct Result *cur_full_res;
+      struct Result *cur_upd_res;
 
-      if (0 == cur->peers)
-        continue;
 
-      str_d_total = NULL;
-      str_d_setup = NULL;
-      str_d_lp = NULL;
-      str_d_mlp = NULL;
 
-      if (0 >= cur->valid)
-      {
-        fprintf (stderr,
-           "No valid results for %s for %u peers %u addresses!\n",
-           (GNUNET_YES == cur->update) ? "updated" : "full",
-               cur->peers, cur->addresses);
+      //fprintf (stderr, "P: %u I: %u  == %p \n", c_peer, c_iteration, cur_res);
+      cur_full_res = ph.iterations_results[c_iteration].results_array[c_peer];
+      if (c_peer == 0)
+        continue;
+      if (NULL == cur_full_res)
         continue;
-      }
-
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_total.rel_value_us)
-      {
-        fprintf (stderr,
-           "Average total time from %u iterations to solve %s for %u peers %u addresses: %llu us\n",
-           cur->valid,
-           (GNUNET_YES == cur->update) ? "updated" : "full",
-               cur->peers, cur->addresses,
-           (unsigned long long) cur->d_total.rel_value_us / cur->valid);
-        GNUNET_asprintf(&str_d_total, "%llu",
-           (unsigned long long) cur->d_total.rel_value_us / cur->valid);
-      }
-      else
-        GNUNET_asprintf (&str_d_total, "-1");
 
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_setup.rel_value_us)
+      if (ph.measure_updates)
       {
-        fprintf (stderr,
-           "Average total time from %u iterations to setup for %u peers %u addresses: %llu us\n",
-           cur->valid, cur->peers, cur->addresses,
-           (unsigned long long) cur->d_setup.rel_value_us / cur->valid);
-        GNUNET_asprintf(&str_d_setup, "%llu",
-           (unsigned long long) cur->d_setup.rel_value_us / cur->valid);
+        cur_upd_res = ph.iterations_results[c_iteration].update_results_array[c_peer];
+        data_upd_tmp = GNUNET_strdup (data_upd_str);
+        GNUNET_free (data_upd_str);
+        if (GNUNET_YES == cur_full_res->valid)
+        {
+          GNUNET_asprintf (&data_upd_str, "%s;%llu", data_upd_tmp,
+            (NULL == cur_upd_res) ? 0 : cur_upd_res->d_total_full.rel_value_us);
+        }
+        else
+        {
+            GNUNET_asprintf (&data_upd_str, "%s;", data_upd_tmp);
+        }
+        GNUNET_free (data_upd_tmp);
 
       }
-      else
-        GNUNET_asprintf (&str_d_setup, "-1");
 
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_lp.rel_value_us)
-      {
-        fprintf (stderr,
-           "Average total time from %u iterations to solve lp %s for %u peers %u addresses: %llu us\n",
-           cur->valid,
-           (GNUNET_YES == cur->update) ? "updated" : "full",
-           cur->peers, cur->addresses,
-           (unsigned long long) cur->d_lp.rel_value_us / cur->valid);
-        GNUNET_asprintf(&str_d_lp, "%llu",
-           (unsigned long long) cur->d_lp.rel_value_us / ph.total_iterations);
-      }
-      else
-        GNUNET_asprintf (&str_d_lp, "-1");
+      //fprintf (stderr, "P: %u I: %u: P %i  A %i\n", c_peer, c_iteration, cur_res->peers, cur_res->addresses);
+      //fprintf (stderr, "D total: %llu\n", (long long unsigned int) cur_res->d_total.rel_value_us);
 
-      if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != cur->d_mlp.rel_value_us)
+      data_tmp = GNUNET_strdup (data_str);
+      GNUNET_free (data_str);
+      if (GNUNET_YES == cur_full_res->valid)
       {
-        fprintf (stderr,
-           "Average total time from %u iterations to solve mlp %s for %u peers %u addresses: %llu us\n",
-           cur->valid,
-           (GNUNET_YES == cur->update) ? "updated" : "full",
-               cur->peers, cur->addresses,
-           (unsigned long long) cur->d_mlp.rel_value_us / cur->valid);
-        GNUNET_asprintf(&str_d_mlp, "%llu",
-           (unsigned long long) cur->d_mlp.rel_value_us / cur->valid);
+          GNUNET_asprintf (&data_str, "%s;%llu", data_tmp,
+              cur_full_res->d_total_full.rel_value_us);
       }
       else
-        GNUNET_asprintf (&str_d_mlp, "-1");
-
-      data = NULL;
-      if (GNUNET_YES == ph.create_plot)
       {
-        GNUNET_asprintf (&data,
-                         "%u;%u;%s;%s;%s;%s\n",
-                         cur->peers, cur->addresses,
-                         str_d_total,
-                         str_d_setup,
-                         str_d_lp,
-                         str_d_mlp);
-        if (cur->update == GNUNET_NO)
-        {
-          if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_full, data, strlen(data)))
-            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                        "Cannot write data to log file `%s'\n",
-                        data_fn_full);
-        }
-        if ((cur->update == GNUNET_YES) && (NULL != f_update))
-        {
-          if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_update, data, strlen(data)))
-            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                        "Cannot write data to log file `%s'\n",
-                        data_fn_update);
-        }
-        GNUNET_free (data);
+          GNUNET_asprintf (&data_str, "%s;", data_tmp);
       }
 
-      GNUNET_free_non_null (str_d_total);
-      GNUNET_free_non_null (str_d_setup);
-      GNUNET_free_non_null (str_d_lp);
-      GNUNET_free_non_null (str_d_mlp);
+      GNUNET_free (data_tmp);
+    }
+    data_tmp = GNUNET_strdup (data_str);
+    GNUNET_free (data_str);
+    GNUNET_asprintf (&data_str, "%s\n", data_tmp);
+    GNUNET_free (data_tmp);
+
+    fprintf (stderr, "Result full solution: %s\n", data_str);
+    if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_full, data_str, strlen(data_str)))
+      GNUNET_break (0);
+    GNUNET_free (data_str);
+
+    if (ph.measure_updates)
+    {
+      data_upd_tmp = GNUNET_strdup (data_upd_str);
+      GNUNET_free (data_upd_str);
+      GNUNET_asprintf (&data_upd_str, "%s\n", data_upd_tmp);
+      GNUNET_free (data_upd_tmp);
+
+      fprintf (stderr, "Result updated solution: `%s'\n", data_upd_str);
+      if (GNUNET_SYSERR == GNUNET_DISK_file_write (f_update, data_upd_str, strlen(data_upd_str)))
+        GNUNET_break (0);
+      GNUNET_free (data_upd_str);
     }
   }
 
@@ -1408,8 +1041,11 @@ perf_run_iteration (void)
   int count_p = ph.N_peers_end;
   int count_a = ph.N_address;
   struct ATS_Address * cur_addr;
+  uint32_t net;
 
-
+  ph.iterations_results[ph.current_iteration-1].results_array = GNUNET_malloc ((count_p + 1) * sizeof (struct Result *));
+  if (ph.measure_updates)
+    ph.iterations_results[ph.current_iteration-1].update_results_array = GNUNET_malloc ((count_p + 1) * sizeof (struct Result *));
   ph.peers = GNUNET_malloc ((count_p) * sizeof (struct PerfPeer));
   for (cp = 0; cp < count_p; cp++)
     perf_create_peer (cp);
@@ -1418,6 +1054,7 @@ perf_run_iteration (void)
 
   for (cp = 0; cp < count_p; cp++)
   {
+    fprintf (stderr,"%u..", cp);
     if (GNUNET_NO == ph.bulk_running)
     {
       ph.bulk_running = GNUNET_YES;
@@ -1428,11 +1065,25 @@ perf_run_iteration (void)
     {
       cur_addr = perf_create_address (cp, ca);
       /* Add address */
-      ph.env.sf.s_add (ph.solver, cur_addr, GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_ATS_NetworkTypeCount));
+
+      /* Random network selection */
+      //net = 1 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_ATS_NetworkTypeCount - 1);
+      /* Random equally distributed network selection */
+      net = 1 + (ca %  (GNUNET_ATS_NetworkTypeCount - 1));
+      /* fprintf (stderr, "Network: %u `%s'\n",
+       * mod_net , GNUNET_ATS_print_network_type(mod_net)); */
+
+      cur_addr->atsi = GNUNET_new (struct GNUNET_ATS_Information);
+      cur_addr->atsi_count = 1;
+      cur_addr->atsi[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+      cur_addr->atsi[0].value = htonl (net);
+      ph.env.sf.s_add (ph.solver, cur_addr, net);
+
       ph.current_a = ca + 1;
       perf_address_initial_update (ph.solver, ph.addresses, cur_addr);
-      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-          "Adding address for peer %u address %u\n", cp, ca);
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Adding address for peer %u address %u in network %s\n", cp, ca,
+          GNUNET_ATS_print_network_type(net));
     }
     /* Notify solver about request */
     ph.env.sf.s_get (ph.solver, &ph.peers[cp].id);
@@ -1476,7 +1127,7 @@ perf_run_iteration (void)
       GNUNET_assert (GNUNET_NO == ph.bulk_running);
     }
   }
-
+  fprintf (stderr,"\n");
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
       "Done, cleaning up addresses\n");
   if (GNUNET_NO == ph.bulk_running)
@@ -1496,7 +1147,8 @@ perf_run_iteration (void)
       ph.env.sf.s_del (ph.solver, cur, GNUNET_NO);
       next = cur->next;
       GNUNET_CONTAINER_DLL_remove(ph.peers[cp].head, ph.peers[cp].tail, cur);
-      GNUNET_free(cur);
+      GNUNET_free_non_null (cur->atsi);
+      GNUNET_free (cur);
     }
   }
 
@@ -1520,6 +1172,7 @@ run (void *cls, char * const *args, const char *cfgfile,
   unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
   unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
   int c;
+  int c2;
 
   /* Extract test name */
   if (NULL == (sep  = (strstr (src_filename,".c"))))
@@ -1576,6 +1229,7 @@ run (void *cls, char * const *args, const char *cfgfile,
   if (0 == ph.N_address)
     ph.N_address = DEFAULT_ADDRESSES;
 
+
   if (ph.N_peers_start != ph.N_peers_end)
     fprintf (stderr, "Benchmarking solver `%s' with %u to %u peers and %u addresses in %u iterations\n",
         ph.ats_string, ph.N_peers_start, ph.N_peers_end, ph.N_address, ph.total_iterations);
@@ -1604,22 +1258,6 @@ run (void *cls, char * const *args, const char *cfgfile,
 
   /* Create array of DLL to store results for iterations */
   ph.iterations_results = GNUNET_malloc (sizeof (struct Iteration) * ph.total_iterations);
-  ph.averaged_full_result = GNUNET_malloc (sizeof (struct Result) * ((ph.N_peers_end + 1) - ph.N_peers_start));
-  for (c = 0; c <= ph.N_peers_end - ph.N_peers_start; c++)
-  {
-    ph.averaged_full_result[c].d_setup = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_full_result[c].d_total = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_full_result[c].d_lp = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_full_result[c].d_mlp = GNUNET_TIME_UNIT_FOREVER_REL;
-  }
-  ph.averaged_update_result = GNUNET_malloc (sizeof (struct Result) * ((ph.N_peers_end + 1) - ph.N_peers_start));
-  for (c = 0; c <= ph.N_peers_end - ph.N_peers_start; c++)
-  {
-    ph.averaged_update_result[c].d_setup = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_update_result[c].d_total = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_update_result[c].d_lp = GNUNET_TIME_UNIT_FOREVER_REL;
-    ph.averaged_update_result[c].d_mlp = GNUNET_TIME_UNIT_FOREVER_REL;
-  }
 
   /* Load solver */
   ph.env.cfg = solver_cfg;
@@ -1664,15 +1302,29 @@ run (void *cls, char * const *args, const char *cfgfile,
     evaluate (ph.current_iteration);
     fprintf (stderr, "Iteration %u of %u done\n", ph.current_iteration, ph.total_iterations);
   }
-  evaluate_average ();
+  if (ph.create_datafile)
+    write_all_iterations ();
 
   /* Unload solver*/
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Unloading solver `%s'\n"), ph.ats_string);
   GNUNET_PLUGIN_unload (plugin, ph.solver);
   GNUNET_free (plugin);
+  for (c = 0; c < ph.total_iterations; c++ )
+  {
+    for (c2 = ph.N_peers_start; c2 < ph.N_peers_end; c2++ )
+    {
+      if (0 == c2)
+        continue;
+      if (ph.measure_updates)
+        GNUNET_free_non_null (ph.iterations_results[c].update_results_array[c2]);
+      GNUNET_free (ph.iterations_results[c].results_array[c2]);
+    }
+    if (ph.measure_updates)
+      GNUNET_free (ph.iterations_results[c].update_results_array);
+    GNUNET_free(ph.iterations_results[c].results_array);
+  }
   GNUNET_free (ph.iterations_results);
-  GNUNET_free (ph.averaged_full_result);
-  GNUNET_free (ph.averaged_update_result);
+
   GNUNET_CONFIGURATION_destroy (solver_cfg);
   GNUNET_STATISTICS_destroy (ph.stat, GNUNET_NO);
   ph.solver = NULL;
@@ -1693,7 +1345,7 @@ main (int argc, char *argv[])
   ph.N_peers_end = 0;
   ph.N_address = 0;
   ph.ats_string = NULL;
-  ph.create_plot = GNUNET_NO;
+  ph.create_datafile = GNUNET_NO;
   ph.measure_updates = GNUNET_NO;
   ph.total_iterations = 1;
 
@@ -1713,9 +1365,9 @@ main (int argc, char *argv[])
       { 'p', "percentage", NULL,
           gettext_noop ("update a fix percentage of addresses"),
           1, &GNUNET_GETOPT_set_uint, &ph.opt_update_percent },
-      { 'g', "gnuplot", NULL,
-          gettext_noop ("create GNUplot file"),
-          0, &GNUNET_GETOPT_set_one, &ph.create_plot},
+      { 'd', "data", NULL,
+          gettext_noop ("create data file"),
+          0, &GNUNET_GETOPT_set_one, &ph.create_datafile},
       { 'u', "update", NULL,
           gettext_noop ("measure updates"),
           0, &GNUNET_GETOPT_set_one, &ph.measure_updates},