Update test framework

qizongjun · May 2, 2018 · f3b0e9f · f3b0e9f
1 parent 80f608f
commit f3b0e9f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 40 deletions.
diff --git a/epi_judge_cpp/CMakeLists.txt b/epi_judge_cpp/CMakeLists.txt
@@ -10,8 +10,6 @@ else()
     link_libraries(pthread)
 endif()
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
 add_executable(a_b_sqrt2 a_b_sqrt2.cc)
 add_executable(absent_value_array absent_value_array.cc)
 add_executable(adding_credits adding_credits.cc)

diff --git a/epi_judge_cpp/test_framework/generic_test.h b/epi_judge_cpp/test_framework/generic_test.h
@@ -13,7 +13,6 @@
 #include "generic_test_handler.h"
 #include "json_parser.h"
 #include "platform.h"
-//#include "test_complexity.h"
 #include "test_config.h"
 #include "test_timer.h"
 #include "test_utils.h"
@@ -180,18 +179,6 @@ TestResult RunTests(GenericTestHandler<Function, Comparator>& handler,
   }
 
   std::string complexity;
-  /*if (!durations.empty() && config.analyze_complexity) {
-    std::vector<long long> time;
-    std::transform(
-        durations.begin(), durations.end(), std::back_inserter(time),
-        [](const auto& d) {
-          return std::chrono::duration_cast<std::chrono::nanoseconds>(d)
-              .count();
-        });
-
-    complexity = test_complexity::MinimalLeastSqMultipleParams(
-        handler.MetricNames(), metrics, time);
-  }*/
 
   std::cout << std::endl;
   if (config.verbose) {

diff --git a/epi_judge_cpp_solutions/CMakeLists.txt b/epi_judge_cpp_solutions/CMakeLists.txt
@@ -10,8 +10,6 @@ else()
     link_libraries(pthread)
 endif()
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-
 add_executable(a_b_sqrt2 a_b_sqrt2.cc)
 add_executable(absent_value_array absent_value_array.cc)
 add_executable(adding_credits adding_credits.cc)

diff --git a/epi_judge_cpp_solutions/test_framework/generic_test.h b/epi_judge_cpp_solutions/test_framework/generic_test.h
@@ -13,7 +13,6 @@
 #include "generic_test_handler.h"
 #include "json_parser.h"
 #include "platform.h"
-//#include "test_complexity.h"
 #include "test_config.h"
 #include "test_timer.h"
 #include "test_utils.h"
@@ -180,18 +179,6 @@ TestResult RunTests(GenericTestHandler<Function, Comparator>& handler,
   }
 
   std::string complexity;
-  /*if (!durations.empty() && config.analyze_complexity) {
-    std::vector<long long> time;
-    std::transform(
-        durations.begin(), durations.end(), std::back_inserter(time),
-        [](const auto& d) {
-          return std::chrono::duration_cast<std::chrono::nanoseconds>(d)
-              .count();
-        });
-
-    complexity = test_complexity::MinimalLeastSqMultipleParams(
-        handler.MetricNames(), metrics, time);
-  }*/
 
   std::cout << std::endl;
   if (config.verbose) {

diff --git a/epi_judge_java/epi/test_framework/GenericTest.java b/epi_judge_java/epi/test_framework/GenericTest.java
@@ -146,11 +146,7 @@ private static TestResult runTests(GenericTestHandler handler,
     }
 
     String complexity = "";
-    /*if (config.analyzeComplexity) {
-      complexity = TestComplexity.minimalLeastSqMultipleParams(
-          handler.metricNames(), metrics, durations);
-    }*/
-
+
     System.out.println();
 
     if (!durations.isEmpty() && config.verbose) {

diff --git a/epi_judge_java_solutions/epi/test_framework/GenericTest.java b/epi_judge_java_solutions/epi/test_framework/GenericTest.java
@@ -146,11 +146,7 @@ private static TestResult runTests(GenericTestHandler handler,
     }
 
     String complexity = "";
-    /*if (config.analyzeComplexity) {
-      complexity = TestComplexity.minimalLeastSqMultipleParams(
-          handler.metricNames(), metrics, durations);
-    }*/
-
+
     System.out.println();
 
     if (!durations.isEmpty() && config.verbose) {