Debug : Some links (Switch/EndSwitch) was masked

diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx
index 125b0517a8dae46b8331269c38cd144afbfe0cd4..edc316d63d9729c7af59fc54c746e25a5afd309e 100644 (file)
--- a/src/Supervision/Graph_Impl.cxx
+++ b/src/Supervision/Graph_Impl.cxx
@@ -522,9 +522,10 @@ SUPERV::LNode_ptr Graph_Impl::LNode( const char * InitName ,
       myEndNode->SetObjRef( SUPERV::ELNode::_duplicate( iendobject ) ) ;
       myNode->SetCoupled( myEndNode->BaseNode()->Name() ) ;
       myEndNode->SetCoupled( myNode->BaseNode()->Name() ) ;
-      Link( myNode->Port( "DoLoop" ) , myEndNode->Port( "DoLoop" ) ) ;
+//JR 25.01.2005  That links are already done in SetCoupled above ...
+//      Link( myNode->Port( "DoLoop" ) , myEndNode->Port( "DoLoop" ) ) ;
 //      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "InitLoop" ) ) ;
-      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "DoLoop" ) ) ;
+//      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "DoLoop" ) ) ;
     }
   }
   anEndOfLoop = SUPERV::ELNode::_duplicate( iendobject ) ;
@@ -1379,8 +1380,15 @@ SUPERV::ListOfNodes * Graph_Impl::Nodes() {
   RetVal->Graphs.length(0) ;
   if ( !IsMacro() ) {
     int i ;
+    cout << DataFlowEditor()->Graph()->GetGraphNodeSize() << " Nodes in the Map and "
+         << DataFlowEditor()->Graph()->GraphNodesSize() << " Nodes int the Vector" << endl ;
     for ( i = 0 ; i < DataFlowEditor()->Graph()->GraphNodesSize() ; i++ ) {
       GraphBase::ComputingNode * aNode = DataFlowEditor()->Graph()->GraphNodes( i ) ;
+#if 1
+      cout << i << ". Vector : " << aNode->Name() << " Map : "
+           << DataFlowEditor()->Graph()->GetGraphNode( aNode->Name() )->Name()
+           << endl ;
+#endif
       RetVal = SetNode( RetVal , aNode ) ;
     }
 #if 0
@@ -1476,8 +1484,9 @@ SUPERV::ListOfLinks * Graph_Impl::Links( GraphBase::ComputingNode * theNode ,
 //                        << anOutPort->PortName() << ") --> " << aNode->Name() << "("
 //                        << anInPort->PortName() << ")" ) ;
                 if ( theNode == NULL ||
-                     ( theNode != NULL && !theNode->IsEndSwitchNode() &&
-                       !strcmp( theNode->Name() , aNode->Name() ) ) ) {
+//JR 14.02.2005 : Debug : we must see also that links !
+//                     ( theNode != NULL && !theNode->IsEndSwitchNode() &&
+                       !strcmp( theNode->Name() , aNode->Name() ) ) {
                   if ( anInPort->IsLoop() || anOutPort->IsLoop() ||
                        ( aNode->IsEndLoopNode() && !strcmp( aNode->CoupledNode()->Name() ,
                                                             anOutPort->NodeName() ) ) ) {
@@ -1546,7 +1555,8 @@ SUPERV::ListOfLinks * Graph_Impl::Links( GraphBase::ComputingNode * theNode ,
             if ( theNode == NULL ||
                  !strcmp( theNode->Name() , aNode->Name() ) ) {
               if ( !anInPort->IsDataStream() ) {
-                if ( theNode || ( toNode->IsEndSwitchNode() && !aNode->IsSwitchNode() ) ) {
+//JR 14.02.2005 : Debug : we must see also that links !
+//                if ( theNode || ( toNode->IsEndSwitchNode() && !aNode->IsSwitchNode() ) ) {
                   if ( anInputParam == NULL ||
                        !strcmp( anInPort->PortName() , anInputParam ) ) {
                     if ( anInPort->IsLoop() || anOutPort->IsLoop() ||
@@ -1593,7 +1603,7 @@ SUPERV::ListOfLinks * Graph_Impl::Links( GraphBase::ComputingNode * theNode ,
 //                             << anOutPort->PortName() << ") --> " << toNode->Name() << "("
 //                             << anInPort->PortName() << ")" << " skipped" ) ;
                  }
-               }
+//             }
              }
            }
          }