Changeset - r558:f53d641aa967
« 557:3bd048
560:49a39b »
gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Improve timer and counter tests (#253) - Do not print the output of counter_test.cc. - Check the output of counter_test.cc. - Shorten the running time of time_measure_test.cc.
0 2 0
default
2 files changed with 43 insertions and 18 deletions:
test/counter_test.cc
39
12
test/time_measure_test.cc
4
6
↑ Collapse diff ↑
test/counter_test.cc
Show white space 2 line context
... ... 
@@ -20,2 +20,5 @@
20 20 
#include <vector>
21 
#include <sstream>
22 

			




	
	23
	
		
#include "test/test_tools.h"


			




	21
	24
	
		

			




	...
	...
	
		
@@ -25,5 +28,7 @@


			




	25
	28
	
		
void bubbleSort(std::vector<T>& v) {


			




	26
	
	
		
  Counter op("Bubble Sort - Operations: ");


			




	27
	
	
		
  Counter::NoSubCounter as(op, "Assignments: ");


			




	28
	
	
		
  Counter::NoSubCounter co(op, "Comparisons: ");


			




	
	29
	
		
  std::stringstream s1, s2, s3;


			




	
	30
	
		
  {


			




	
	31
	
		
    Counter op("Bubble Sort - Operations: ", s1);


			




	
	32
	
		
    Counter::SubCounter as(op, "Assignments: ", s2);


			




	
	33
	
		
    Counter::SubCounter co(op, "Comparisons: ", s3);


			




	29
	34
	
		
  for (int i = v.size()-1; i > 0; --i) {


			




	...
	...
	
		
@@ -40,2 +45,6 @@


			




	40
	45
	
		
}


			




	
	46
	
		
  check(s1.str() == "Bubble Sort - Operations: 102\n", "Wrong counter");


			




	
	47
	
		
  check(s2.str() == "Assignments: 57\n", "Wrong subcounter");


			




	
	48
	
		
  check(s3.str() == "Comparisons: 45\n", "Wrong subcounter");


			




	
	49
	
		
}


			




	41
	50
	
		

			




	...
	...
	
		
@@ -43,5 +52,7 @@


			




	43
	52
	
		
void insertionSort(std::vector<T>& v) {


			




	44
	
	
		
  Counter op("Insertion Sort - Operations: ");


			




	45
	
	
		
  Counter::NoSubCounter as(op, "Assignments: ");


			




	46
	
	
		
  Counter::NoSubCounter co(op, "Comparisons: ");


			




	
	53
	
		
  std::stringstream s1, s2, s3;


			




	
	54
	
		
  {


			




	
	55
	
		
    Counter op("Insertion Sort - Operations: ", s1);


			




	
	56
	
		
    Counter::SubCounter as(op, "Assignments: ", s2);


			




	
	57
	
		
    Counter::SubCounter co(op, "Comparisons: ", s3);


			




	47
	58
	
		
  for (int i = 1; i < int(v.size()); ++i) {


			




	...
	...
	
		
@@ -59,10 +70,16 @@


			




	59
	70
	
		
}


			




	
	71
	
		
  check(s1.str() == "Insertion Sort - Operations: 56\n", "Wrong counter");


			




	
	72
	
		
  check(s2.str() == "Assignments: 37\n", "Wrong subcounter");


			




	
	73
	
		
  check(s3.str() == "Comparisons: 19\n", "Wrong subcounter");


			




	
	74
	
		
}


			




	60
	75
	
		

			




	61
	76
	
		
template <typename MyCounter>


			




	62
	
	
		
void counterTest() {


			




	63
	
	
		
  MyCounter c("Main Counter: ");


			




	
	77
	
		
void counterTest(bool output) {


			




	
	78
	
		
  std::stringstream s1, s2, s3;


			




	
	79
	
		
  {


			




	
	80
	
		
    MyCounter c("Main Counter: ", s1);


			




	64
	81
	
		
  c++;


			




	65
	
	
		
  typename MyCounter::SubCounter d(c, "SubCounter: ");


			




	
	82
	
		
    typename MyCounter::SubCounter d(c, "SubCounter: ", s2);


			




	66
	83
	
		
  d++;


			




	67
	
	
		
  typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ");


			




	
	84
	
		
    typename MyCounter::SubCounter::NoSubCounter e(d, "SubSubCounter: ", s3);


			




	68
	85
	
		
  e++;


			




	...
	...
	
		
@@ -74,2 +91,12 @@


			




	74
	91
	
		
}


			




	
	92
	
		
  if (output) {


			




	
	93
	
		
    check(s1.str() == "Main Counter: 3\n", "Wrong Counter");


			




	
	94
	
		
    check(s2.str() == "SubCounter: 3\n", "Wrong SubCounter");


			




	
	95
	
		
    check(s3.str() == "", "Wrong NoSubCounter");


			




	
	96
	
		
  } else {


			




	
	97
	
		
    check(s1.str() == "", "Wrong NoCounter");


			




	
	98
	
		
    check(s2.str() == "", "Wrong SubCounter");


			




	
	99
	
		
    check(s3.str() == "", "Wrong NoSubCounter");


			




	
	100
	
		
  }


			




	
	101
	
		
}


			




	75
	102
	
		

			




	...
	...
	
		
@@ -82,4 +109,4 @@


			




	82
	109
	
		
{


			




	83
	
	
		
  counterTest<Counter>();


			




	84
	
	
		
  counterTest<NoCounter>();


			




	
	110
	
		
  counterTest<Counter>(true);


			




	
	111
	
		
  counterTest<NoCounter>(false);


			




	85
	112
	
		

			




        

    

    

    

        

            

                

                    test/time_measure_test.cc
                

                

                  
                  
                  
                  Show white space
                  2 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -41,10 +41,8 @@


			




	41
	41
	
		
  unsigned int n;


			




	42
	
	
		
  for(n=0;T.realTime()<1.0;n++) ;


			




	
	42
	
		
  for(n=0;T.realTime()<0.1;n++) ;


			




	43
	43
	
		
  std::cout << T << " (" << n << " time queries)\n";


			




	44
	
	
		
  T.restart();


			




	45
	
	
		
  while(T.realTime()<2.0) ;


			




	46
	
	
		
  std::cout << T << '\n';


			




	
	44
	
		

			




	47
	45
	
		
  TimeStamp full;


			




	48
	46
	
		
  TimeStamp t;


			




	49
	
	
		
  t=runningTimeTest(f,1,&n,&full);


			




	
	47
	
		
  t=runningTimeTest(f,0.1,&n,&full);


			




	50
	48
	
		
  std::cout << t << " (" << n << " tests)\n";


			




	...
	...
	
		
@@ -52,3 +50,3 @@


			




	52
	50
	
		

			




	53
	
	
		
  t=runningTimeTest(g,1,&n,&full);


			




	
	51
	
		
  t=runningTimeTest(g,0.1,&n,&full);


			




	54
	52
	
		
  std::cout << t << " (" << n << " tests)\n";


			




        

    






    
    



    


    

     
    
0 comments (0 inline)