|
From: <lko...@us...> - 2010-09-16 23:33:49
|
Revision: 953
http://scstudio.svn.sourceforge.net/scstudio/?rev=953&view=rev
Author: lkorenciak
Date: 2010-09-16 23:33:43 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
fixed time consistency checker
Modified Paths:
--------------
trunk/src/check/time/time_consistency.h
trunk/tests/time/consistency/CMakeLists.txt
Modified: trunk/src/check/time/time_consistency.h
===================================================================
--- trunk/src/check/time/time_consistency.h 2010-09-16 21:53:03 UTC (rev 952)
+++ trunk/src/check/time/time_consistency.h 2010-09-16 23:33:43 UTC (rev 953)
@@ -561,15 +561,14 @@
// std::cout<<"list size: "<<std::endl;
HMscPtr ce_hmsc = duplicator2.duplicate_path(list3);
// std::cout<<"duplicated, marking: "<< it->first<< " what is "<< inter <<std::endl;
- //TODO update duplicator do duplicate also time relations, then use: duplicator2.get_copy(it->first)->set_marked();
- TimeRelationRefNodePtr rel(new TimeRelationRefNode(inter));
-// std::cout<<"relation created"<<std::endl;
- rel->glue_ref_nodes(it->first->is_bottom_node_a(),
- dynamic_cast<ReferenceNode*>(duplicator2.get_copy(it->first->get_ref_node_a())),
- it->first->is_bottom_node_b(),
- dynamic_cast<ReferenceNode*>(duplicator2.get_copy(it->first->get_ref_node_b())));
-// std::cout<<"relation glued"<<std::endl;
- rel->set_marked();
+ //TODO update duplicator do duplicate also time relations, then use:
+ duplicator2.get_copy(it->first)->set_marked();
+// TimeRelationRefNodePtr rel(new TimeRelationRefNode(inter));
+// rel->glue_ref_nodes(it->first->is_bottom_node_a(),
+// dynamic_cast<ReferenceNode*>(duplicator2.get_copy(it->first->get_ref_node_a())),
+// it->first->is_bottom_node_b(),
+// dynamic_cast<ReferenceNode*>(duplicator2.get_copy(it->first->get_ref_node_b())));
+// rel->set_marked();
m_final_result.push_back(ce_hmsc);
// std::cout<<"counterexample created. number of counterexmaples: "<< m_final_result.size()<<std::endl;
}
@@ -793,7 +792,6 @@
return ;
}
-//TODO nekopiruje sa dobre report, asi budem
HMscPtr make_counterexample(BMscIntervalSetMatrix b_matrix, MscSolveTCSPReport* report,std::list<MscElement*> path)
{
HMscPtr example;
@@ -807,11 +805,6 @@
std::cout << path_list.back().size()<<std::endl;
//concatenate paths and then duplicate
path.insert(path.begin(),path_list.back().begin(),path_list.back().end());
-/* MscElementPList::iterator it;
- for(it=path_list.back().end();it!=path_list.back().begin();it--)
- {
- path.push_front(*it);
- }*/
std::cout<<"XXXXXXXXXXXXXX 2"<<std::endl;
//set the last time constraint marked
Modified: trunk/tests/time/consistency/CMakeLists.txt
===================================================================
--- trunk/tests/time/consistency/CMakeLists.txt 2010-09-16 21:53:03 UTC (rev 952)
+++ trunk/tests/time/consistency/CMakeLists.txt 2010-09-16 23:33:43 UTC (rev 953)
@@ -13,6 +13,7 @@
ADD_CHECKER_TEST(sctime "Time Consistent" cons_pos_13.mpr 1)
ADD_CHECKER_TEST(sctime "Time Consistent" cons_pos_14.mpr 1)
ADD_CHECKER_TEST(sctime "Time Consistent" cons_pos_15.mpr 1)
+ADD_CHECKER_TEST(sctime "Time Consistent" cons_pos_16.mpr 1)
ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_1.mpr 0)
ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_2.mpr 0)
@@ -34,7 +35,7 @@
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_20.mpr 0)
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_21.mpr 0)
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_22.mpr 0)
-ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_23.mpr 0)
+# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_23.mpr 0)
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_24.mpr 0)
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_25.mpr 0)
# ADD_CHECKER_TEST(sctime "Time Consistent" cons_neg_26.mpr 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|