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

[<va...@us...>]

Revision: 711
          http://scstudio.svn.sourceforge.net/scstudio/?rev=711&view=rev
Author:   vacek
Date:     2010-04-01 10:41:01 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
ElementaryCyclesTraverser: g++ warnings solved; LivelockChecker tests fixed.

Modified Paths:
--------------
    trunk/src/data/elementary_cycles_traverser.h
    trunk/tests/livelock_checker_test.cpp

Modified: trunk/src/data/elementary_cycles_traverser.h
===================================================================
--- trunk/src/data/elementary_cycles_traverser.h	2010-03-30 16:54:45 UTC (rev 710)
+++ trunk/src/data/elementary_cycles_traverser.h	2010-04-01 10:41:01 UTC (rev 711)
@@ -53,7 +53,7 @@
 public:
   MscElementPListList circuit_enumeration(HMscNode *n);
   TarjanCycles(unsigned vertex_count, std::string restriction)
-    :m_vertex_count(vertex_count), m_restriction(restriction)
+    :m_restriction(restriction), m_vertex_count(vertex_count)
   {}
 private:
   std::string m_restriction;
@@ -103,7 +103,7 @@
    }
    void traverse(HMscPtr hmsc);
    ElementaryCyclesTraverser(void)
-     :m_traverser("EC_color"), m_restriction_enabled(false)
+     :m_traverser("EC_color"), m_restriction_enabled(false), m_restriction_name("")
    {}
    void cleanup_traversing_attributes(void)
    {
@@ -132,7 +132,7 @@
 public:
   void on_white_node_found(HMscNode *n);
   CycleListener(unsigned vertex_count, const ElementaryCycleListenerPList &listeners, const std::string &restriction)
-    :m_vertex_count(vertex_count), m_listeners(listeners), m_restriction(restriction)
+    :m_vertex_count(vertex_count), m_restriction(restriction), m_listeners(listeners) 
   {}
 
 private:

Modified: trunk/tests/livelock_checker_test.cpp
===================================================================
--- trunk/tests/livelock_checker_test.cpp	2010-03-30 16:54:45 UTC (rev 710)
+++ trunk/tests/livelock_checker_test.cpp	2010-04-01 10:41:01 UTC (rev 711)
@@ -21,18 +21,25 @@
     
   HMscPtr h1(new HMsc(L"h1"));
   HMscPtr h2(new HMsc(L"h2"));
+  BMscPtr bmsc(new BMsc());
 
   StartNodePtr start1 = new StartNode(); h1->set_start(start1);
   EndNodePtr end1(new EndNode);h1->add_node(end1);
   ReferenceNodePtr p1(new ReferenceNode());h1->add_node(p1);
+  p1->set_msc(bmsc);
   ReferenceNodePtr p2(new ReferenceNode());h1->add_node(p2);
+  p2->set_msc(bmsc);
   ReferenceNodePtr p3(new ReferenceNode());h1->add_node(p3);
   ReferenceNodePtr p4(new ReferenceNode());h1->add_node(p4);
+  p4->set_msc(bmsc);
 
   StartNodePtr start2 = new StartNode(); h2->set_start(start2);
   ReferenceNodePtr n1(new ReferenceNode());h2->add_node(n1);
+  n1->set_msc(bmsc);
   ReferenceNodePtr n2(new ReferenceNode());h2->add_node(n2);
+  n2->set_msc(bmsc);
   ReferenceNodePtr n3(new ReferenceNode());h2->add_node(n3);
+  n3->set_msc(bmsc);
   
   start1->add_successor(p1.get());
   p1->add_successor(p2.get());
@@ -69,11 +76,14 @@
   std::cout << "          end      " << std::endl;
     
   HMscPtr h1(new HMsc(L"h1"));
+  BMscPtr bmsc(new BMsc());
 
   StartNodePtr start1 = new StartNode(); h1->set_start(start1);
   EndNodePtr end1(new EndNode);h1->add_node(end1);
   ReferenceNodePtr p1(new ReferenceNode());h1->add_node(p1);
+  p1->set_msc(bmsc);
   ReferenceNodePtr p2(new ReferenceNode());h1->add_node(p2);
+  p2->set_msc(bmsc);
   
   start1->add_successor(p1.get());
   p1->add_successor(p2.get());
@@ -102,11 +112,14 @@
   std::cout << "          end      " << std::endl;
     
   HMscPtr h1(new HMsc(L"h1"));
+  BMscPtr bmsc(new BMsc());
 
   StartNodePtr start1 = new StartNode(); h1->set_start(start1);
   EndNodePtr end1(new EndNode);h1->add_node(end1);
   ReferenceNodePtr p1(new ReferenceNode());h1->add_node(p1);
+  p1->set_msc(bmsc);
   ReferenceNodePtr p2(new ReferenceNode());h1->add_node(p2);
+  p2->set_msc(bmsc);
   
   start1->add_successor(p1.get());
   p1->add_successor(end1.get());


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