|
From: <ma...@us...> - 2011-05-09 22:32:15
|
Revision: 1090
http://scstudio.svn.sourceforge.net/scstudio/?rev=1090&view=rev
Author: madzin
Date: 2011-05-09 22:32:09 +0000 (Mon, 09 May 2011)
Log Message:
-----------
Remove debugging outputs and corect the return value of membership test
Modified Paths:
--------------
trunk/src/membership/membership_time.cpp
trunk/tests/membership/CMakeLists.txt
Modified: trunk/src/membership/membership_time.cpp
===================================================================
--- trunk/src/membership/membership_time.cpp 2011-05-09 22:26:55 UTC (rev 1089)
+++ trunk/src/membership/membership_time.cpp 2011-05-09 22:32:09 UTC (rev 1090)
@@ -131,7 +131,6 @@
//TODO to nemoze byt list intervalov v evente pri absolutnom case, to nedava zmysel
MscTimeIntervalSetD a = *(min_a->get_absolut_times().begin());
MscTimeIntervalSetD b = *(max_b->get_absolut_times().begin());
-std::cout << "see 1 a " << a << " b " << b << std::endl;
bmsc_inter = get_continous_interval(c, a, b);
}
else
@@ -360,7 +359,6 @@
inter = get_continous_interval(c, a, b);
// inter = get_continous_interval(c, *(first->get_absolut_times().begin()), *(second->get_absolut_times().begin()));
-std::cout << "time interval inter " << inter << std::endl;
}
else
inter = c->get_time_matrix()->operator()(first, second);
@@ -571,7 +569,6 @@
MscTimeIntervalSetD a = *(min_a->get_absolut_times().begin());
MscTimeIntervalSetD b = *(max_b->get_absolut_times().begin());
//TODO to nemoze byt list intervalov v evente pri absolutnom case, to nedava zmysel
-std::cout << "see 2" << std::endl;
bmsc_inter = get_continous_interval(c, a, b);
}
else
@@ -599,7 +596,6 @@
MscTimeIntervalSetD a = *(min_a->get_absolut_times().begin());
MscTimeIntervalSetD b = *(max_b->get_absolut_times().begin());
//TODO to nemoze byt list intervalov v evente pri absolutnom case, to nedava zmysel
-std::cout << "see 3" << std::endl;
bmsc_inter = get_continous_interval(c, a, b);
}
else
@@ -644,7 +640,6 @@
MscTimeIntervalSetD a = *(min_a->get_absolut_times().begin());
MscTimeIntervalSetD b = *(min_b->get_absolut_times().begin());
//TODO to nemoze byt list intervalov v evente pri absolutnom case, to nedava zmysel
-std::cout << "see 4" << std::endl;
bmsc_inter = get_continous_interval(c, a, b);
}
else
Modified: trunk/tests/membership/CMakeLists.txt
===================================================================
--- trunk/tests/membership/CMakeLists.txt 2011-05-09 22:26:55 UTC (rev 1089)
+++ trunk/tests/membership/CMakeLists.txt 2011-05-09 22:32:09 UTC (rev 1090)
@@ -273,4 +273,4 @@
ADD_TEST(membership_test-121 ${MEMBERSHIP_TEST_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_hmsc02.mpr ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_bmsc02_1.mpr 1)
-ADD_TEST(membership_test-122 ${MEMBERSHIP_TEST_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_hmsc02.mpr ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_bmsc02_2.mpr 0)
+ADD_TEST(membership_test-122 ${MEMBERSHIP_TEST_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_hmsc02.mpr ${CMAKE_CURRENT_SOURCE_DIR}/absolut_time_bmsc02_2.mpr 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|