[GNUnet-SVN] r29143 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2013-09-10 10:44:03 +0200 (Tue, 10 Sep 2013)
New Revision: 29143

Modified:
   gnunet/src/ats/ats.conf.in
   gnunet/src/ats/gnunet-service-ats-solver_proportional.c
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/test_ats_api.conf
   gnunet/src/ats/test_ats_change_preference.c
   gnunet/src/ats/test_ats_simplistic_change_preference.c
   gnunet/src/ats/test_ats_simplistic_pref_aging.c
Log:
more renaming from simplistic to proportional


Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in  2013-09-10 08:04:52 UTC (rev 29142)
+++ gnunet/src/ats/ats.conf.in  2013-09-10 08:44:03 UTC (rev 29143)
@@ -10,8 +10,8 @@
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
-# Designated assigment mode: simplistic / MLP
-MODE = simplistic 
+# Designated assigment mode: PROPORTIONAL / MLP / RIL
+MODE = PROPORTIONAL 
 
 # Network specific inbound/outbound quotas
 UNSPECIFIED_QUOTA_IN = 64 KiB

Modified: gnunet/src/ats/gnunet-service-ats-solver_proportional.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_proportional.c     2013-09-10 
08:04:52 UTC (rev 29142)
+++ gnunet/src/ats/gnunet-service-ats-solver_proportional.c     2013-09-10 
08:44:03 UTC (rev 29143)
@@ -37,9 +37,9 @@
  * on gnunet.org:/vcs/fsnsg/ats-paper.git/tech-doku/ats-tech-guide.tex
  * use build_txt.sh to generate plaintext output
  *
- * ATS addresses : simplistic solver
+ * ATS addresses : proportional solver
  *
- *    The simplistic solver ("simplistic") distributes the available
+ *    The proportional solver ("proportional") distributes the available
  *    bandwidth fair over all the addresses influenced by the
  *    preference values. For each available network type an in- and
  *    outbound quota is configured and the bandwidth available in
@@ -76,13 +76,13 @@
  *    is used to specify network related information as total adresses
  *    and active addresses in this network and the configured in- and
  *    outbound quota. Each network also contains a list of addresses
- *    added to the solver located in this network. The simplistic
+ *    added to the solver located in this network. The proportional
  *    solver uses the addresses' solver_information field to store the
- *    simplistic network it belongs to for each address.
+ *    proportional network it belongs to for each address.
  *
  *     3.2 Initializing
  *
- *    When the simplistic solver is initialized the solver creates a
+ *    When the proportional solver is initialized the solver creates a
  *    new solver handle and initializes the network structures with
  *    the quotas passed from addresses and returns the handle solver.
  *
@@ -95,7 +95,7 @@
  *     3.4 Updating an address
  *
  *    The main purpose of address updates is to update the ATS
- *    information for addresse selection. Important for the simplistic
+ *    information for addresse selection. Important for the proportional
  *    solver is when an address switches network it is located
  *    in. This is common because addresses added by transport's
  *    validation mechanism are commonly located in
@@ -104,12 +104,12 @@
  *    return of payload data transport switches to the real network
  *    the address is located in.  When an address changes networks it
  *    is first of all removed from the old network using the solver
- *    API function GAS_simplistic_address_delete and the network in
+ *    API function GAS_proportional_address_delete and the network in
  *    the address struct is updated. A lookup for the respective new
- *    simplistic network is done and stored in the addresse's
+ *    proportional network is done and stored in the addresse's
  *    solver_information field. Next the address is re-added to the
  *    solver using the solver API function
- *    GAS_simplistic_address_add. If the address was marked as in
+ *    GAS_proportional_address_add. If the address was marked as in
  *    active, the solver checks if bandwidth is available in the
  *    network and if yes sets the address to active and updates the
  *    bandwidth distribution in this network. If no bandwidth is

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2013-09-10 08:04:52 UTC 
(rev 29142)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2013-09-10 08:44:03 UTC 
(rev 29143)
@@ -116,7 +116,7 @@
  *    it as a value_number. If no configuration value is found it will assign
  *    GNUNET_ATS_DefaultBandwidth. The most important step is to load the
  *    configured solver using configuration "[ats]:MODE". Current solvers are
- *    MODE_SIMPLISTIC, MODE_MLP. Interaction is done using a solver API
+ *    MODE_PROPORTIONAL, MODE_MLP. Interaction is done using a solver API
  *
  *     1.4 Solver API
  *

Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf    2013-09-10 08:04:52 UTC (rev 29142)
+++ gnunet/src/ats/test_ats_api.conf    2013-09-10 08:44:03 UTC (rev 29143)
@@ -20,7 +20,7 @@
 UNIX_MATCH_GID = YES
 
 # Enable MLP mode (default: NO)
-MODE = SIMPLISTIC
+MODE = PROPORTIONAL
 #MODE = MLP
 # Network specific inbound/outbound quotas
 # UNSPECIFIED

Modified: gnunet/src/ats/test_ats_change_preference.c
===================================================================
--- gnunet/src/ats/test_ats_change_preference.c 2013-09-10 08:04:52 UTC (rev 
29142)
+++ gnunet/src/ats/test_ats_change_preference.c 2013-09-10 08:44:03 UTC (rev 
29143)
@@ -26,7 +26,7 @@
  */
 /**
  * @file ats/test_ats_change_preferences.c
- * @brief test for ats simplistic solver preference aging:
+ * @brief test for ats proportional solver preference aging:
  *     Add 2 addresses and set high preference for one. Expect higher bw for 
this
  *     address, wait. Preferences should age and so bw assigned should 
decrease.
  * @author Christian Grothoff

Modified: gnunet/src/ats/test_ats_simplistic_change_preference.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_change_preference.c      2013-09-10 
08:04:52 UTC (rev 29142)
+++ gnunet/src/ats/test_ats_simplistic_change_preference.c      2013-09-10 
08:44:03 UTC (rev 29143)
@@ -26,7 +26,7 @@
  */
 /**
  * @file ats/test_ats_simplistic_change_preference.c
- * @brief test for changing preferences in ats simplistic solver
+ * @brief test for changing preferences in ats proportional solver
  * @author Christian Grothoff
  * @author Matthias Wachs
  */

Modified: gnunet/src/ats/test_ats_simplistic_pref_aging.c
===================================================================
--- gnunet/src/ats/test_ats_simplistic_pref_aging.c     2013-09-10 08:04:52 UTC 
(rev 29142)
+++ gnunet/src/ats/test_ats_simplistic_pref_aging.c     2013-09-10 08:44:03 UTC 
(rev 29143)
@@ -26,7 +26,7 @@
  */
 /**
  * @file ats/test_ats_api_scheduling_add_address.c
- * @brief test for ats simplistic solver preference aging:
+ * @brief test for ats proportional solver preference aging:
  *     Add 2 addresses and set high preference for one. Expect higher bw for 
this
  *     address, wait. Preferences should age and so bw assigned should 
decrease.
  * @author Christian Grothoff
@@ -439,7 +439,7 @@
 int
 main (int argc, char *argv[])
 {
-  if (0 != GNUNET_TESTING_peer_run ("test_ats_simplistic_pref_aging",
+  if (0 != GNUNET_TESTING_peer_run ("test_ats_proportional_pref_aging",
                                     "test_ats_api.conf",
                                     &run, NULL))
     return 1;