From 26cfa65cf943b3e6c64c2f73498815d2eca11412 Mon Sep 17 00:00:00 2001 From: rahuel Date: Fri, 10 Jun 2005 08:08:53 +0000 Subject: [PATCH] A wrong debug that I do not know is commented --- src/Supervision/Graph_Impl.cxx | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx index b18c89a..abeac2f 100644 --- a/src/Supervision/Graph_Impl.cxx +++ b/src/Supervision/Graph_Impl.cxx @@ -816,6 +816,11 @@ SUPERV::Graph_var Graph_Impl::LoadDataFlows( GraphExecutor::DataFlow * aDataFlow aMacroGraphExe->CoupledNode( aMacroNode ) ; aMacroNode->CoupledNode( aMacroGraphExe ) ; +//JR 04.05.2005 Debug : InPorts values of MacroNodes are like for other nodes +// InPorts values of MacroGraphs of MacroNodes are done in the Executor +// It was probably to try to debug anything but it was a wrong debug and I do not know what bug +// ===> folowing code is commented +#if 0 // initialize MacroNode's InPorts with corresponding "external" values int q ; for ( q = 0 ; q < aMacroNode->GetNodeInPortsSize() ; q++ ) { @@ -832,7 +837,7 @@ SUPERV::Graph_var Graph_Impl::LoadDataFlows( GraphExecutor::DataFlow * aDataFlow } } } // end of init MacroNode's InPorts - +#endif aMacroGraphImpl->Run() ; } @@ -1123,7 +1128,7 @@ SUPERV::CNode_ptr Graph_Impl::Node(char const * aNodeName ) { SUPERV::Link_ptr Graph_Impl::Link( SUPERV::Port_ptr OutPort , SUPERV::Port_ptr InPort ) { -// beginService( "Graph_Impl::Link" ); + beginService( "Graph_Impl::Link" ); SUPERV::Link_var iobject = SUPERV::Link::_nil() ; if ( DataFlowEditor()->IsEditing() && !DataFlowEditor()->IsReadOnly() && !OutPort->IsDataStream() && !InPort->IsDataStream() && !IsMacro() ) { @@ -1166,12 +1171,14 @@ SUPERV::Link_ptr Graph_Impl::Link( SUPERV::Port_ptr OutPort , } } else { + MESSAGE( "Graph_Impl::Link( " << OutPort->Name() << " " << anOutPort << " , " + << InPort->Name() << " " << anInPort << " ) ObjRef already exists" ) ; iobject = anOutPort->InPortObjRef( anInPort ) ; } } } DataFlowEditor()->UnValid() ; -// endService( "Graph_Impl::Link" ); + endService( "Graph_Impl::Link" ); return SUPERV::Link::_duplicate( iobject ) ; } @@ -1381,14 +1388,13 @@ 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 ; + MESSAGE( DataFlowEditor()->Graph()->GetGraphNodeSize() << " Nodes in the Map and " + << DataFlowEditor()->Graph()->GraphNodesSize() << " Nodes int the Vector" ) ; 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 ; + MESSAGE( i << ". Vector : " << aNode->Name() << " Map : " + << DataFlowEditor()->Graph()->GetGraphNode( aNode->Name() )->Name() ) ; #endif RetVal = SetNode( RetVal , aNode ) ; } -- 2.39.2