fixing doxygen

[oweals/gnunet.git] / src / ats / Makefile.am

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index d280a1ab0a72fcfbd2c269e2c2ca28810ade8c48..533cddec770039a208512bb696bf37ff00d205aa 100644 (file)
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,5 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
+plugindir = $(libdir)/gnunet
+
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
@@ -8,36 +10,102 @@ pkgcfg_DATA = \
   ats.conf
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+noinst_PROGRAMS = \
+ gnunet-ats-solver-eval
+
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
-  GN_MLP_SRC = gnunet-service-ats-solver_mlp.c gnunet-service-ats-solver_mlp.h
-  GN_MLP_TEST = test_ats_mlp
-  GN_MLP_TEST_UPDATE = test_ats_mlp_update
-  GN_MLP_TEST_AVG = test_ats_mlp_averaging
+  GN_MLP_LIB = libgnunet_plugin_ats_mlp.la
   GN_MLP_PERF = perf_ats_mlp
+  GN_MLP_ADD_ADDRESS = test_ats_solver_add_address_mlp
+  GN_MLP_ADD_REQUEST_ADDRESS = test_ats_solver_add_address_and_request_mlp
+  GN_MLP_REQUEST_ADD_ADDRESS = test_ats_solver_request_and_add_address_mlp
+  GN_MLP_REQUEST_DELETE_ADDRESS = test_ats_solver_request_and_delete_address_mlp
+  GN_MLP_PREFERENCES_ADDRESS = test_ats_solver_preferences_mlp
+  GN_MLP_ALTERNATIVE_DELETE_ADDRESS = test_ats_solver_alternative_after_delete_address_mlp
+  GN_MLP_SOLVER_PERF = perf_ats_solver_mlp
 endif
 
 lib_LTLIBRARIES = libgnunetats.la
 
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_ats_proportional.la \
+  $(GN_MLP_LIB) \
+  libgnunet_plugin_ats_ril.la
+
+gnunet_ats_solver_eval_SOURCES = \
+ gnunet-ats-solver-eval.c gnunet-ats-solver-eval.h \
+ gnunet-service-ats_normalization.c
+gnunet_ats_solver_eval_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(LTLIBINTL)
+gnunet_ats_solver_eval_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
+
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
-  ats_api_performance.c 
-
+  ats_api_performance.c
 libgnunetats_la_LIBADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
-
 libgnunetats_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
   -version-info 4:0:0
 
+libgnunet_plugin_ats_proportional_la_SOURCES = \
+  plugin_ats_proportional.c
+libgnunet_plugin_ats_proportional_la_LIBADD = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_proportional_la_DEPENDENCIES = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_ats_proportional_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
+
+if HAVE_LIBGLPK
+libgnunet_plugin_ats_mlp_la_SOURCES = \
+  plugin_ats_mlp.c
+libgnunet_plugin_ats_mlp_la_LIBADD = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_ats_mlp_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS) $(GN_LIBGLPK)
+libgnunet_plugin_ats_mlp_la_DEPENDENCIES = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+endif
+
+libgnunet_plugin_ats_ril_la_SOURCES = \
+  plugin_ats_ril.c
+libgnunet_plugin_ats_ril_la_LIBADD = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_ats_ril_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_ats_ril_la_DEPENDENCIES = \
+  libgnunetats.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 libexec_PROGRAMS = \
  gnunet-service-ats
@@ -46,9 +114,6 @@ gnunet_service_ats_SOURCES = \
  gnunet-service-ats.c gnunet-service-ats.h\
  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \
  gnunet-service-ats_normalization.c gnunet-service-ats_normalization.h \
- gnunet-service-ats-solver_proportional.c gnunet-service-ats-solver_proportional.h \
- $(GN_MLP_SRC) \
- gnunet-service-ats-solver_ril.c gnunet-service-ats-solver_ril.h \
  gnunet-service-ats_performance.c gnunet-service-ats_performance.h \
  gnunet-service-ats_scheduling.c gnunet-service-ats_scheduling.h \
  gnunet-service-ats_reservations.c gnunet-service-ats_reservations.h
@@ -56,7 +121,6 @@ gnunet_service_ats_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetats.la \
-  $(GN_LIBGLPK) \
   $(GN_LIBINTL)
 gnunet_service_ats_DEPENDENCIES = \
   libgnunetats.la
@@ -77,28 +141,33 @@ TESTING_TESTS = \
  test_ats_api_performance_monitor \
  test_ats_api_performance_monitor_initial_callback \
  test_ats_solver_add_address_proportional \
- test_ats_solver_add_address_mlp \
- test_ats_solver_add_address_ril
-# test_ats_api_scheduling_min_bw
-# test_ats_api_scheduling_check_min_bw_alt
-# test_ats_api_scheduling_update_address
-# test_ats_api_scheduling_destroy_inbound_connection
-# test_ats_api_scheduling_block_and_reset
-# test_ats_normalization_update_quality
-# test_ats_change_preference
-# test_ats_simplistic
-# test_ats_simplistic_switch_networks
-# test_ats_simplistic_change_preference
-# test_ats_api_performance_address_info
-# test_ats_api_performance_feedback
+ test_ats_solver_add_address_and_request_proportional \
+ test_ats_solver_request_and_add_address_proportional \
+ test_ats_solver_request_and_delete_address_proportional \
+ test_ats_solver_alternative_after_delete_address_proportional \
+ test_ats_solver_preferences_proportional \
+ test_ats_solver_preferences_ril \
+ $(GN_MLP_ADD_ADDRESS) \
+ $(GN_MLP_ADD_REQUEST_ADDRESS) \
+ $(GN_MLP_REQUEST_ADD_ADDRESS) \
+ $(GN_MLP_REQUEST_DELETE_ADDRESS) \
+ $(GN_MLP_ALTERNATIVE_DELETE_ADDRESS) \
+ $(GN_MLP_PREFERENCES_ADDRESS) \
+ test_ats_solver_add_address_ril \
+ test_ats_solver_add_address_and_request_ril \
+ test_ats_solver_request_and_add_address_ril \
+ test_ats_solver_request_and_delete_address_ril \
+ test_ats_solver_alternative_after_delete_address_ril \
+ perf_ats_solver_proportional \
+ $(GN_MLP_SOLVER_PERF) \
+ perf_ats_solver_ril
 endif
 
 check_PROGRAMS = \
  $(TESTING_TESTS)
-# $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
-# $(GN_MLP_TEST_AVG)
 
 if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -111,7 +180,7 @@ test_ats_api_scheduling_init_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la      
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_SOURCES = \
  test_ats_api_scheduling_add_address.c \
@@ -120,7 +189,7 @@ test_ats_api_scheduling_add_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_inbound_SOURCES = \
  test_ats_api_scheduling_add_address_inbound.c \
@@ -129,7 +198,7 @@ test_ats_api_scheduling_add_address_inbound_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_address_duplicate_SOURCES = \
  test_ats_api_scheduling_add_address_duplicate.c \
@@ -138,7 +207,7 @@ test_ats_api_scheduling_add_address_duplicate_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_SOURCES = \
  test_ats_api_scheduling_destroy_address.c \
@@ -147,7 +216,7 @@ test_ats_api_scheduling_destroy_address_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_address_twice_SOURCES = \
  test_ats_api_scheduling_destroy_address_twice.c \
@@ -156,7 +225,7 @@ test_ats_api_scheduling_destroy_address_twice_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la    
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_add_session_SOURCES = \
  test_ats_api_scheduling_add_session.c test_ats_api_common.c
@@ -164,7 +233,7 @@ test_ats_api_scheduling_add_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 test_ats_api_scheduling_destroy_session_SOURCES = \
  test_ats_api_scheduling_destroy_session.c test_ats_api_common.c
@@ -172,7 +241,7 @@ test_ats_api_scheduling_destroy_session_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 # performance API tests
 
@@ -193,7 +262,7 @@ test_ats_api_performance_list_peer_addresses_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-       
+
 test_ats_api_performance_list_all_addresses_active_SOURCES = \
  test_ats_api_performance_list_all_addresses_active.c
 test_ats_api_performance_list_all_addresses_active_LDADD = \
@@ -211,145 +280,199 @@ test_ats_api_performance_monitor_LDADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-       
+
 test_ats_api_performance_monitor_initial_callback_SOURCES = \
- test_ats_api_performance_monitor_initial_callback.c   
+ test_ats_api_performance_monitor_initial_callback.c
 test_ats_api_performance_monitor_initial_callback_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-       
+
 # solver tests
 test_ats_solver_add_address_proportional_SOURCES = \
- test_ats_solver_add_address.c 
+ test_ats_solver_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
 test_ats_solver_add_address_proportional_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-       
+
+if HAVE_LIBGLPK
 test_ats_solver_add_address_mlp_SOURCES = \
- test_ats_solver_add_address.c 
+ test_ats_solver_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
 test_ats_solver_add_address_mlp_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-               
+endif
+
 test_ats_solver_add_address_ril_SOURCES = \
- test_ats_solver_add_address.c 
+ test_ats_solver_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
 test_ats_solver_add_address_ril_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
        $(top_builddir)/src/statistics/libgnunetstatistics.la
-                       
 
-#test_ats_api_scheduling_min_bw_SOURCES = \
-# test_ats_api_scheduling_min_bw.c test_ats_api_common.c
-#test_ats_api_scheduling_min_bw_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-#
-#test_ats_api_scheduling_check_min_bw_alt_SOURCES = \
-# test_ats_api_scheduling_check_min_bw_alt.c test_ats_api_common.c
-#test_ats_api_scheduling_check_min_bw_alt_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
+test_ats_solver_add_address_and_request_proportional_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
+if HAVE_LIBGLPK
+test_ats_solver_add_address_and_request_mlp_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+endif
 
-#test_ats_api_scheduling_update_address_SOURCES = \
-# test_ats_api_scheduling_update_address.c test_ats_api_common.c
-#test_ats_api_scheduling_update_address_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-  
-#test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \
-# test_ats_api_scheduling_destroy_inbound_connection.c test_ats_api_common.c
-#test_ats_api_scheduling_destroy_inbound_connection_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
+test_ats_solver_add_address_and_request_ril_SOURCES = \
+ test_ats_solver_add_address_and_request.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_add_address_and_request_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_api_scheduling_block_and_reset_SOURCES = \
-# test_ats_api_scheduling_block_and_reset.c test_ats_api_common.c
-#test_ats_api_scheduling_block_and_reset_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
 
-#test_ats_api_performance_feedback_SOURCES = \
-# test_ats_api_performance_feedback.c
-#test_ats_api_performance_feedback_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/hello/libgnunethello.la \
-#  $(top_builddir)/src/ats/libgnunetats.la    
+test_ats_solver_request_and_add_address_proportional_SOURCES = \
+ test_ats_solver_request_and_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_add_address_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
+if HAVE_LIBGLPK
+test_ats_solver_request_and_add_address_mlp_SOURCES = \
+ test_ats_solver_request_and_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_add_address_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+endif
 
+test_ats_solver_request_and_add_address_ril_SOURCES = \
+ test_ats_solver_request_and_add_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_add_address_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_api_performance_address_info_SOURCES = \
-# test_ats_api_performance_address_info.c
-#test_ats_api_performance_address_info_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/hello/libgnunethello.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
 
+test_ats_solver_request_and_delete_address_proportional_SOURCES = \
+ test_ats_solver_request_and_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_delete_address_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_simplistic_SOURCES = \
-# test_ats_simplistic.c test_ats_api_common.c
-#test_ats_simplistic_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/hello/libgnunethello.la \
-#  $(top_builddir)/src/ats/libgnunetats.la    
+if HAVE_LIBGLPK
+test_ats_solver_request_and_delete_address_mlp_SOURCES = \
+ test_ats_solver_request_and_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_delete_address_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+endif
 
-#test_ats_simplistic_switch_networks_SOURCES = \
-# test_ats_simplistic_switch_networks.c test_ats_api_common.c
-#test_ats_simplistic_switch_networks_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
+test_ats_solver_request_and_delete_address_ril_SOURCES = \
+ test_ats_solver_request_and_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_request_and_delete_address_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_simplistic_change_preference_SOURCES = \
-# test_ats_simplistic_change_preference.c test_ats_api_common.c
-#test_ats_simplistic_change_preference_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
 
-#test_ats_change_preference_SOURCES = \
-# test_ats_change_preference.c test_ats_api_common.c
-#test_ats_change_preference_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la
+test_ats_solver_alternative_after_delete_address_proportional_SOURCES = \
+ test_ats_solver_alternative_after_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_alternative_after_delete_address_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+
+test_ats_solver_preferences_proportional_SOURCES = \
+ test_ats_solver_preferences.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_preferences_proportional_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 if HAVE_LIBGLPK
-#test_ats_mlp_SOURCES = \
-#  $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c
-#test_ats_mlp_LDADD = \
-#  $(GN_LIBGLPK) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
+test_ats_solver_alternative_after_delete_address_mlp_SOURCES = \
+ test_ats_solver_alternative_after_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_alternative_after_delete_address_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_mlp_update_SOURCES = \
-#  $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c gnunet-service-ats_normalization.c
-#test_ats_mlp_update_LDADD = \
-#  $(GN_LIBGLPK) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
+test_ats_solver_preferences_mlp_SOURCES = \
+ test_ats_solver_preferences.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_preferences_mlp_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
+endif
+
+test_ats_solver_alternative_after_delete_address_ril_SOURCES = \
+ test_ats_solver_alternative_after_delete_address.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_alternative_after_delete_address_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
 #perf_ats_mlp_SOURCES = \
 #  $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c
@@ -357,19 +480,51 @@ if HAVE_LIBGLPK
 #  $(GN_LIBGLPK) \
 #  $(top_builddir)/src/util/libgnunetutil.la \
 #  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-endif  
+#  $(top_builddir)/src/ats/libgnunetats.la
+
+perf_ats_solver_mlp_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+perf_ats_solver_mlp_LDADD = \
+  $(GN_LIBGLPK) \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+
+perf_ats_solver_proportional_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+perf_ats_solver_proportional_LDADD = \
+  $(GN_LIBGLPK) \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+
+perf_ats_solver_ril_SOURCES = \
+  perf_ats_solver.c test_ats_api_common.c gnunet-service-ats_normalization.c
+perf_ats_solver_ril_LDADD = \
+  $(GN_LIBGLPK) \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+
+test_ats_solver_preferences_ril_SOURCES = \
+ test_ats_solver_preferences.c \
+ test_ats_api_common.c test_ats_api_common.h
+test_ats_solver_preferences_ril_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+       $(top_builddir)/src/statistics/libgnunetstatistics.la
 
-#test_ats_normalization_update_quality_SOURCES = \
-#  test_ats_normalization_update_quality.c test_ats_api_common.c
-#test_ats_normalization_update_quality_LDADD = \
-#  $(GN_LIBGLPK) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.la  
-#endif
 EXTRA_DIST = \
   ats.h \
   test_ats_api.conf \
-  test_ats_mlp.conf
\ No newline at end of file
+  test_ats_mlp.conf \
+  test_ats_solver_default.conf \
+  test_ats_solver_proportional.conf \
+  test_ats_solver_mlp.conf \
+  test_ats_solver_ril.conf \
+  perf_ats_solver_mlp.conf \
+  perf_ats_solver_proportional.conf \
+  perf_ats_solver_ril.conf \
+  perf_ats_solver.conf