[Scstudio-commits] SF.net SVN: scstudio:[681] trunk

[<mar...@us...>]

Revision: 681
          http://scstudio.svn.sourceforge.net/scstudio/?rev=681&view=rev
Author:   martinnrt
Date:     2010-03-10 17:38:58 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/src/check/time/CMakeLists.txt
    trunk/src/check/time/hmsc_all_paths.cpp
    trunk/tests/find_block_test.cpp

Modified: trunk/src/check/time/CMakeLists.txt
===================================================================
--- trunk/src/check/time/CMakeLists.txt	2010-03-10 16:04:21 UTC (rev 680)
+++ trunk/src/check/time/CMakeLists.txt	2010-03-10 17:38:58 UTC (rev 681)
@@ -14,7 +14,8 @@
   hmsc_all_paths.cpp
   find_block.cpp
   find_block.h
- 
+  hmsc_block_paths.h
+  hmsc_block_paths.cpp
 )
 
 TARGET_LINK_LIBRARIES(sctime

Modified: trunk/src/check/time/hmsc_all_paths.cpp
===================================================================
--- trunk/src/check/time/hmsc_all_paths.cpp	2010-03-10 16:04:21 UTC (rev 680)
+++ trunk/src/check/time/hmsc_all_paths.cpp	2010-03-10 17:38:58 UTC (rev 681)
@@ -23,6 +23,7 @@
   std::list<PathFoundListener*>::iterator listener_it;  
   
   path_prefix2.push_back(node.get());
+
   
   //check whether node is the one of last nodes
   
@@ -78,4 +79,4 @@
     path_prefix2.pop_back();
     set_number(node, get_number(node)-1);
     return;
-}
\ No newline at end of file
+}

Modified: trunk/tests/find_block_test.cpp
===================================================================
--- trunk/tests/find_block_test.cpp	2010-03-10 16:04:21 UTC (rev 680)
+++ trunk/tests/find_block_test.cpp	2010-03-10 17:38:58 UTC (rev 681)
@@ -3,6 +3,7 @@
 #include "data/msc.h"
 #include "check/time/find_block.h"
 #include "check/time/tightening.h"
+#include "check/time/hmsc_block_paths.h"
 #include "check/liveness/deadlock_checker.h"
 #include <string>
 #include <iostream>
@@ -57,15 +58,15 @@
   MscTimeIntervalSetD ins1;
   ins1.insert(in6);
 
-/*  MscTimeIntervalD in7(10,20);
+  MscTimeIntervalD in7(10,20);
   MscTimeIntervalSetD ins2;
-  ins2.insert(in7); */
+  ins2.insert(in7); 
   
   TimeRelationRefNodePtr rel1a = new TimeRelationRefNode(ins1);
-  rel1a->glue_ref_nodes(0,p1.get(),0,p6.get());
+  rel1a->glue_ref_nodes(0,p2.get(),0,p5.get());
 
-/*  TimeRelationRefNodePtr rel1a2 = new TimeRelationRefNode(ins2);
-  rel1a2->glue_ref_nodes(0,p3.get(),0,p4.get()); */
+  TimeRelationRefNodePtr rel1a2 = new TimeRelationRefNode(ins2);
+  rel1a2->glue_ref_nodes(0,p3.get(),0,p4.get()); 
 
   TraverseAndMarkBlocks* trav_mark = new TraverseAndMarkBlocks();
   trav_mark->travers_and_mark_blocks(h1);
@@ -74,5 +75,9 @@
     {
     std::cout << "Blok:" << (*it).get_number() << " if_end:" << (*it).get_if_end() << std::endl;
     }
+  AllPathsAllBlocks* apab= new AllPathsAllBlocks(trav_mark->m_list_of_blocks, h1);
+  apab->all_paths_all_blocks();
+
+
   return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.