X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2FMakefile.am;h=bc1c2a4d42a912ea222d41a4463736822962cce5;hb=b16608e6740da08cf76e08f817ceeb6994047ca4;hp=d8c74d7ee62ae102ddf8317dd93aa6ddef68f790;hpb=36b7b9b8e10bf92986f9dd45ab7d8522f5843486;p=oweals%2Fgnunet.git

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index d8c74d7ee..bc1c2a4d4 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -17,7 +17,7 @@ endif
 
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
-  GN_MLP_SRC = gnunet-service-ats_addresses_mlp.c gnunet-service-ats_addresses_mlp.h
+  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
@@ -45,8 +45,10 @@ libexec_PROGRAMS = \
 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_addresses_simplistic.c gnunet-service-ats_addresses_simplistic.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
@@ -59,27 +61,32 @@ gnunet_service_ats_LDADD = \
 gnunet_service_ats_DEPENDENCIES = \
   libgnunetats.la
 
-check_PROGRAMS = \
+if HAVE_TESTING
+TESTING_TESTS = \ 
  test_ats_api_scheduling_init \
- test_ats_api_scheduling_add_address \
- test_ats_api_scheduling_add_session \
- 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_address \
- test_ats_api_scheduling_destroy_session \
- test_ats_api_scheduling_destroy_inbound_connection \
- test_ats_api_scheduling_block_and_reset \
- test_ats_simplistic \
- test_ats_simplistic_switch_networks \
- test_ats_simplistic_change_preference \
- test_ats_simplistic_pref_aging \
- test_ats_api_performance_list_addresses \
- test_ats_api_performance_monitor \
- $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
+ test_ats_api_scheduling_add_address
+# test_ats_api_scheduling_add_session
+# 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_address
+# test_ats_api_scheduling_destroy_session
+# 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_list_addresses
+# test_ats_api_performance_address_info
+# test_ats_api_performance_feedback
+endif
+
+check_PROGRAMS = \
+ $(TESTING_TESTS)
+# $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE)
 # $(GN_MLP_TEST_AVG)
-# test_ats_api_scheduling_get_type
-# test_ats_api_bandwidth_consumption
 
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
@@ -99,7 +106,8 @@ test_ats_api_scheduling_add_address_SOURCES = \
 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/ats/libgnunetats.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
@@ -143,21 +151,31 @@ 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
-  
+
 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_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_api_performance_list_addresses_SOURCES = \
  test_ats_api_performance_list_addresses.c
 test_ats_api_performance_list_addresses_LDADD = \
@@ -165,14 +183,14 @@ test_ats_api_performance_list_addresses_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la    
-  
-test_ats_api_performance_monitor_SOURCES = \
- test_ats_api_performance_monitor.c
-test_ats_api_performance_monitor_LDADD = \
+
+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     
+  $(top_builddir)/src/ats/libgnunetats.la
 
 
 test_ats_simplistic_SOURCES = \
@@ -197,16 +215,16 @@ test_ats_simplistic_change_preference_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la
 
-test_ats_simplistic_pref_aging_SOURCES = \
- test_ats_simplistic_pref_aging.c test_ats_api_common.c
-test_ats_simplistic_pref_aging_LDADD = \
+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  
+  $(top_builddir)/src/ats/libgnunetats.la
 
 if HAVE_LIBGLPK
 test_ats_mlp_SOURCES = \
-  $(GN_MLP_SRC) test_ats_mlp.c test_ats_api_common.c
+  $(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 \
@@ -214,16 +232,15 @@ test_ats_mlp_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la  
 
 test_ats_mlp_update_SOURCES = \
-  $(GN_MLP_SRC) test_ats_mlp_update.c test_ats_api_common.c
+  $(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  
-  
-  
+
 perf_ats_mlp_SOURCES = \
-  $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c
+  $(GN_MLP_SRC) perf_ats_mlp.c test_ats_api_common.c gnunet-service-ats_normalization.c
 perf_ats_mlp_LDADD = \
   $(GN_LIBGLPK) \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -231,23 +248,16 @@ perf_ats_mlp_LDADD = \
   $(top_builddir)/src/ats/libgnunetats.la  
 endif  
 
-#test_ats_mlp_averaging_SOURCES = \
-# $(GN_MLP_SRC) test_ats_mlp_averaging.c test_ats_api_common.c
-#test_ats_mlp_averaging_LDADD = \
-#  $(GN_LIBGLPK) \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/statistics/libgnunetstatistics.la
-
-#test_ats_api_bandwidth_consumption_SOURCES = \
-# test_ats_api_bandwidth_consumption.c
-#test_ats_api_bandwidth_consumption_LDADD = \
-#  $(top_builddir)/src/util/libgnunetutil.la \
-#  $(top_builddir)/src/testing/libgnunettesting.la \
-#  $(top_builddir)/src/ats/libgnunetats.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  
 
 EXTRA_DIST = \
   ats.h \
   test_ats_api.conf \
-  test_ats_mlp.conf
-
+  test_ats_mlp.conf
\ No newline at end of file