updated configuration files
[oweals/gnunet.git] / src / ats / perf_ats_mlp.c
index e2d3fb567d49f2e4ab351e246bf3384c5567f403..5d370104b68b7ef9d6d82b3a6e6b033b202fb8f5 100644 (file)
  * @author Christian Grothoff
  * @author Matthias Wachs
 
- */
-
-/*
-     This file is part of GNUnet.
-     (C) 2010,2011 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file ats/test_ats_mlp.c
- * @brief basic test for the MLP solver
- * @author Christian Grothoff
- * @author Matthias Wachs
-
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
@@ -393,39 +366,51 @@ check (void *cls, char *const *args, const char *cfgfile,
                                }
                                if (GNUNET_NO == opt_numeric)
                                {
-                               fprintf (stderr, "Rebuild: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
-                                               cp + 1, ca,
-                                               (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
-                                               (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
-                                               (GLP_YES == full_lp_presolv) ? "YES" : "NO",
-                                               (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
-                                               (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
+                               fprintf (stderr,
+                                        "Rebuild: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n",
+                                        cp + 1, ca,
+                                        (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                        (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                        (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                        (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                        (unsigned long long) full_build_dur.rel_value_us,
+                                        (unsigned long long) full_lp_dur.rel_value_us, 
+                                        (unsigned long long) full_mip_dur.rel_value_us);
                                if ((0 < opt_update_quantity) || (0 < opt_update_percent))
-                                       fprintf (stderr, "Update : %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
-                                               cp + 1, ca,
-                                               (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
-                                               (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
-                                               (GLP_YES == update_lp_presolv) ? "YES" : "NO",
-                                               (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
-                                               (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
+                                 fprintf (stderr, 
+                                          "Update: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in us) %04llu / %04llu / %04llu\n",
+                                          cp + 1, ca,
+                                          (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                          (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                          (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                          (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                          (unsigned long long) update_build_dur.rel_value_us,
+                                          (unsigned long long) update_lp_dur.rel_value_us, 
+                                          (unsigned long long) update_mip_dur.rel_value_us);
                                }
                                else
                                {
-                                               fprintf (stderr, "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
-                                                               cp + 1, ca,
-                                                               (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
-                                                               (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
-                                                               (GLP_YES == full_lp_presolv) ? "YES" : "NO",
-                                                               (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
-                                                               (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
-                                               if ((0 < opt_update_quantity) || (0 < opt_update_percent))
-                                                       fprintf (stderr, "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
-                                                                       cp + 1, ca,
-                                                                       (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
-                                                                       (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
-                                                                       (GLP_YES == update_lp_presolv) ? "YES" : "NO",
-                                                                       (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
-                                                                       (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
+                                 fprintf (stderr, 
+                                          "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
+                                          cp + 1, ca,
+                                          (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                          (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                          (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                          (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                          (unsigned long long) full_build_dur.rel_value_us, 
+                                          (unsigned long long) full_lp_dur.rel_value_us, 
+                                          (unsigned long long) full_mip_dur.rel_value_us);
+                                 if ((0 < opt_update_quantity) || (0 < opt_update_percent))
+                                   fprintf (stderr, 
+                                            "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
+                                            cp + 1, ca,
+                                            (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                            (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                            (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                            (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                            (unsigned long long) update_build_dur.rel_value_us, 
+                                            (unsigned long long) update_lp_dur.rel_value_us, 
+                                            (unsigned long long) update_mip_dur.rel_value_us);
                                }
                        }
        }