X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=51a9ab7cfe824b790f5cd30cdc780c67003412c4;hb=e64f1a51510b44580500fd9ec30b4c937255bf75;hp=3aa696ab482be13d0e63864a488278ebcd596192;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 3aa696a..51a9ab7 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/01/22 15:02:00 $
-Version:   $Revision: 1.1 $
+Date:      $Date: 2008/05/06 13:45:12 $
+Version:   $Revision: 1.17 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -35,24 +35,90 @@ PURPOSE.  See the above copyright notices for more information.
 
 namespace bbtk
 {
+
+
+  static bool bbmgSomeBoxExecuting = false;
+  static bool bbmgFreezeExecution = false;
+  static std::set<BlackBox::Pointer> bbmgExecutionList;
+
+  //=========================================================================
+  BlackBox::Deleter::Deleter()
+  {
+  }
+  //=========================================================================
+  
+  //=========================================================================
+  void BlackBox::Deleter::Delete(Object* p)
+  {
+    BlackBox* b = dynamic_cast<BlackBox*>(p);
+    if (!b)
+      {
+	bbtkInternalError("BlackBox::Deleter::Delete("<<p->GetObjectName()
+			  <<"["<<p<<"]) : "
+			  <<"dynamic cast to BlackBox* failed !");
+      }
+    std::string name = p->GetObjectName();//b->bbGetNameWithParent();
+    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\")"<<std::endl);
+
+
+    BlackBoxDescriptor::WeakPointer desc = b->bbGetDescriptor();
+    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : deleting black box"<<std::endl);
+    
+    b->bbDelete();
+    
+    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : releasing descriptor ["<<desc.lock()<<"]"<<std::endl);
+    
+    if (!desc.expired()) 
+      {
+	Package::WeakPointer pack = desc.lock()->GetPackage();
+	if (!pack.expired()) 
+	  {
+	    Package::ReleaseBlackBoxDescriptor(pack,desc);
+	  }
+	else 
+	  {
+	    bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : descriptor package expired (was not held by a package and the box was the last instance)"<<std::endl);
+	  }
+      }
+    else
+      {
+	bbtkDebugMessage("object",2,"##> BlackBox::Deleter(\""<<name<<"\") : descriptor expired : nothing to do (was not held by a package or the box is a complex black box prototype)"<<std::endl);
+      }
+    bbtkDebugMessage("object",2,"<## BlackBox::Deleter(\""<<name<<"\")"<<std::endl);
+  }
+  //=========================================================================
+
   //=========================================================================
   BlackBox::BlackBox(const std::string &name) 
-    : bbmName(name), bbmStatus(MODIFIED), 
-      bbmBoxProcessMode("Pipeline"),bbmParent(NULL)
+    : bbmName(name), 
+      bbmStatus(MODIFIED), 
+      bbmBoxProcessMode("Pipeline"),
+      bbmParent()
+
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox(\""
+    bbtkDebugMessage("object",4,"==> BlackBox::BlackBox(\""
+		     <<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",4,"<== BlackBox::BlackBox(\""
 		     <<name<<"\")"<<std::endl);
   }
   //=========================================================================
 
+  //=========================================================================
+  BlackBox::BlackBox(const BlackBox&)
+  {}
 
   //=========================================================================
   BlackBox::BlackBox(BlackBox& from, const std::string &name) 
     : bbmName(name), 
       bbmStatus(from.bbmStatus), 
-      bbmBoxProcessMode(from.bbmBoxProcessMode),bbmParent(NULL)
+      bbmBoxProcessMode(from.bbmBoxProcessMode),
+      bbmParent()
+
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox("
+    bbtkDebugMessage("object",4,"==> BlackBox::BlackBox("
+		     <<from.bbGetFullName()<<",\""
+		     <<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",4,"<== BlackBox::BlackBox("
 		     <<from.bbGetFullName()<<",\""
 		     <<name<<"\")"<<std::endl);
   }
@@ -62,21 +128,11 @@ namespace bbtk
   //=========================================================================
   BlackBox::~BlackBox()
   {
-    //    std::cout << "EED BlackBox::~BlackBox 01 [" << bbGetName()<<"]\n";
-    bbtkDebugMessageInc("Core",7,"BlackBox::~BlackBox()"<<std::endl);
+    bbtkDebugMessage("object",4,"==> BlackBox::~BlackBox() ["<<bbmName
+		     <<"]"<<std::endl);
     this->bbDesallocateConnectors();
-    //printf("EED BlackBox::~BlackBox 02 \n");
-    bbtkDebugDecTab("Core",7);
-  }
-  //=========================================================================
-
-  //=========================================================================
-  /// Destruction method of a black box
-  void BlackBox::bbDelete()
-  {
-    bbtkDebugMessage("Core",5,"BlackBox::bbDelete() ["
-		     <<bbGetFullName()<<"]"<<std::endl);    
-    this->bbUserDelete();
+    bbtkDebugMessage("object",4,"<== BlackBox::~BlackBox() ["<<bbmName
+		     <<"]"<<std::endl);
   }
   //=========================================================================
 
@@ -85,16 +141,16 @@ namespace bbtk
   /// Main processing method of the box.
   void BlackBox::bbExecute(bool force)
   {
-    bbtkDebugMessageInc("Process",1,
+    bbtkDebugMessageInc("process",2,
 			"=> BlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
-    wx::BeginBusyCursor();
+ 
+    Wx::BeginBusyCursor();
 
     // If execution frozen : return
     if (bbGlobalGetFreezeExecution()) 
       {
-	bbtkDebugMessage("Process",1,
+	bbtkDebugMessage("process",2,
 			 " -> FreezeExecution global flag is 'true' : abort execution"<<std::endl);
       }
 
@@ -102,11 +158,11 @@ namespace bbtk
     if (force) bbSetModifiedStatus();
 
     // Calls the main recursive update method 
-    bbBackwardUpdate(0);
+    bbBackwardUpdate(Connection::Pointer());
 
-    wx::EndBusyCursor();
+    Wx::EndBusyCursor();
 
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",2,
 			"<= BlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
@@ -115,7 +171,7 @@ namespace bbtk
   //=========================================================================
   std::string BlackBox::bbGetFullName() const
   { 
-    return bbGetNameWithParent()+"<"+this->bbGetDescriptor()->GetTypeName()+">";
+    return this->bbGetNameWithParent()+"<"+this->bbGetDescriptor()->GetTypeName()+">";
   }
   //=========================================================================
      
@@ -125,9 +181,9 @@ namespace bbtk
   /// Returns the name with the name of the parent prepended if any
   std::string BlackBox::bbGetNameWithParent() const
   {
-    if (bbmParent) 
+    if (bbmParent.lock()) 
       {
-	return bbmParent->bbGetNameWithParent() + ":" + bbmName;
+	return bbmParent.lock()->bbGetNameWithParent() + ":" + bbmName;
       }
     else 
       {
@@ -149,13 +205,13 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an input of name name
   bool BlackBox::bbHasInput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbHasInput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"
 			<<std::endl);
     bool r = ( bbGetDescriptor()->GetInputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetInputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -165,11 +221,11 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an output of name name
   bool BlackBox::bbHasOutput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"BlackBox::bbHasOutput(\""
+    bbtkDebugMessageInc("Kernel",8,"BlackBox::bbHasOutput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     bool r = ( bbGetDescriptor()->GetOutputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetOutputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -179,11 +235,11 @@ namespace bbtk
   ///  Gets the output type of a given name
   TypeInfo BlackBox::bbGetOutputType( const std::string &name ) const 
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetOutputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetOutputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8); 
+    bbtkDebugDecTab("Kernel",8); 
     return r;
   }
   //=========================================================================
@@ -192,11 +248,11 @@ namespace bbtk
   ///  Gets the input type of a given name
   TypeInfo BlackBox::bbGetInputType( const std::string &name ) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetInputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetInputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -206,7 +262,7 @@ namespace bbtk
   /// Allocates the i/o connectors of the black box
   void BlackBox::bbAllocateConnectors()
   {  
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbAllocateConnectors() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);					
@@ -215,20 +271,20 @@ namespace bbtk
     BlackBoxDescriptor::InputDescriptorMapType::const_iterator i;	
     for ( i = imap.begin(); i != imap.end(); ++i )			
       {									
-	bbtkDebugMessage("Core",8,"* Allocate \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
 	bbGetInputConnectorMap()[i->second->GetName()] 
-	  = new BlackBoxInputConnector(this);
+	  = new BlackBoxInputConnector(GetThisPointer<BlackBox>());
       }									
     const BlackBoxDescriptor::OutputDescriptorMapType& omap 
       = bbGetDescriptor()->GetOutputDescriptorMap();		       
     BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o; 
     for ( o = omap.begin(); o != omap.end(); ++o )
       {							
-	bbtkDebugMessage("Core",8,"* Allocate \""<<o->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
 	bbGetOutputConnectorMap()[o->second->GetName()] 
 	  = new BlackBoxOutputConnector();
       }
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
   }
   //=========================================================================
 
@@ -237,7 +293,7 @@ namespace bbtk
   /// Desallocates the i/o connectors of the black box
   void BlackBox::bbDesallocateConnectors()
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbDesallocateConnectors()"
 			<<std::endl);					
 
@@ -245,18 +301,18 @@ namespace bbtk
     for ( i = bbGetInputConnectorMap().begin();
 	  i != bbGetInputConnectorMap().end(); ++i )		       
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<i->first<<"\""<<std::endl);
 	delete (i->second);
       }									
     OutputConnectorMapType::const_iterator o;	
     for ( o = bbGetOutputConnectorMap().begin(); 
 	  o != bbGetOutputConnectorMap().end(); ++o )			
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
 	delete (o->second);
       }									
    
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
 
   }
   //=========================================================================
@@ -266,7 +322,7 @@ namespace bbtk
   /// Copies the input / output values from another box
   void BlackBox::bbCopyIOValues(BlackBox& from)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
     			"BlackBox::bbCopyIOValues("
 			<<from.bbGetFullName()<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -291,7 +347,7 @@ namespace bbtk
 	this->bbSetOutput(output, from.bbGetOutput(output) );
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
   }
   //=========================================================================
@@ -303,7 +359,7 @@ namespace bbtk
   { 
     return ( bbGlobalGetSomeBoxExecuting() 
 #ifdef _USE_WXWIDGETS_
-	     || WxBlackBox::bbGlobalIsSomeWindowAlive() 
+	     || Wx::IsSomeWindowAlive() 
 #endif
 	     ); 
   }
@@ -315,7 +371,7 @@ namespace bbtk
   /// User overloadable destruction method of a black box
   void BlackBox::bbUserDelete() 
   {   
-    bbtkDebugMessage("Process",5,
+    bbtkDebugMessage("process",5,
 		     "=> BlackBox::bbUserDelete() ["
 		     <<bbGetFullName()<<"]"
 		     <<" : not overloaded; using standard deletion"
@@ -364,55 +420,55 @@ namespace bbtk
   ///  Signals that the BlackBox has been modified
   void BlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c)
   {
-    bbtkDebugMessageInc("Process",5,
-			"=> BlackBox::bbSetModifiedStatus("<<c<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
-   
+    bbtkDebugMessage("modified",1,
+		     "==> BlackBox::bbSetModifiedStatus("<<c<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);
+    
     if ( (c==bbGetInputConnectorMap().find("WinHide")->second) )
-	 //	 && (bbCanReact()))
+      //	 && (bbCanReact()))
       {
-	bbtkDebugMessage("Process",9,
+	bbtkDebugMessage("modified",2,
 			 "-> Hide triggered by WinHide input change"
 			 <<std::endl);
 	this->bbHideWindow();
 	this->bbSetStatus(MODIFIED); 
 	return;
       }
- 
+    
     if ( ( bbBoxProcessModeIsReactive()  ||
 	   (c==bbGetInputConnectorMap().find("BoxExecute")->second))
 	 && (bbCanReact() ) )
       {
-	bbtkDebugMessage("Process",9,
+	bbtkDebugMessage("modified",2,
 			 "-> Execution triggered by Reactive mode or BoxExecute input change"<<std::endl);
 	this->bbSetStatus(MODIFIED); 
-        bbGlobalAddToExecutionList( this );
+        bbGlobalAddToExecutionList( GetThisPointer<BlackBox>() );
       }
     else if ( bbGetStatus() == MODIFIED ) //! this->bbIsUptodate()) 
       { 
-	bbtkDebugMessage("Process",5,"-> Already modified"<<std::endl);
-	bbtkDebugDecTab("Process",5);
+	bbtkDebugMessage("modified",2,"-> Already modified"<<std::endl);
 	return;
       }
     else 
       {
-	bbtkDebugMessage("Process",5,"-> Status set to modified"<<std::endl);
-	bbtkDebugDecTab("Process",5);
+	bbtkDebugMessage("modified",2,"-> Status set to modified"<<std::endl);
 	this->bbSetStatus(MODIFIED); 
       }
  
     this->bbSignalOutputModification(false);
 
-   bbtkDebugMessageDec("Process",5,
+    /* 
+  bbtkDebugMessageDec("process",5,
 			"<= BlackBox::bbSetModifiedStatus("<<c<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
+    */
   }  
   //=========================================================================
 
   //=========================================================================  
   void BlackBox::bbSignalOutputModification(bool reaction)
   {
-    bbtkDebugMessageInc("Process",5,
+    bbtkDebugMessageInc("process",5,
 			"=> BlackBox::bbSignalOutputModification() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
@@ -433,7 +489,7 @@ namespace bbtk
 
     if (reaction) bbGlobalProcessExecutionList();
 
-    bbtkDebugMessageDec("Process",5,
+    bbtkDebugMessageDec("process",5,
 			"<= BlackBox::bbSignalOutputModification() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
@@ -443,7 +499,7 @@ namespace bbtk
   void BlackBox::bbSignalOutputModification(const std::string& output,
 	bool reaction)
   {
-    bbtkDebugMessageInc("Process",5,
+    bbtkDebugMessageInc("process",5,
 			"=> BlackBox::bbSignalOutputModification("
 			<<output<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -465,10 +521,10 @@ namespace bbtk
       }
   if (reaction) bbGlobalProcessExecutionList();
 
-    bbtkDebugMessageDec("Process",5,
-			"<= BlackBox::bbSignalOutputModification("
-			<<output<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
+  bbtkDebugMessageDec("process",5,
+                      "<= BlackBox::bbSignalOutputModification("
+                      <<output<<") ["
+                      <<bbGetFullName()<<"]"<<std::endl);
 
   }  
   //=========================================================================   
@@ -476,7 +532,7 @@ namespace bbtk
   void BlackBox::bbSignalOutputModification(const std::vector<std::string>& output,
 	bool reaction)
   {
-    bbtkDebugMessageInc("Process",5,
+    bbtkDebugMessageInc("process",5,
 			"=> BlackBox::bbSignalOutputModification(vector of outputs) ["
 			<<bbGetFullName()<<"]"<<std::endl);
     OutputConnectorMapType::iterator i;
@@ -501,7 +557,7 @@ namespace bbtk
       }
   if (reaction) bbGlobalProcessExecutionList();
 
-   bbtkDebugMessageDec("Process",5,
+   bbtkDebugMessageDec("process",5,
 		       "<= BlackBox::bbSignalOutputModification(vector of outputs) ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
@@ -514,13 +570,13 @@ namespace bbtk
   ///          else MODIFIED 
   IOStatus BlackBox::bbUpdateInputs(bool excludeParent)
   {
-    bbtkDebugMessageInc("Process",4,
+    bbtkDebugMessageInc("process",4,
 			"=> BlackBox::bbUpdateInputs() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);	
 
     IOStatus s = UPTODATE;
-    
+
     InputConnectorMapType::iterator i;
     for ( i = bbGetInputConnectorMap().begin(); 
 	  i!= bbGetInputConnectorMap().end(); ++i) 
@@ -536,7 +592,7 @@ namespace bbtk
 	if (t==MODIFIED) s = MODIFIED;
       }
     
-   bbtkDebugMessageDec("Process",4,
+   bbtkDebugMessageDec("process",4,
 			"<= BlackBox::bbUpdateInputs() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);	
@@ -551,10 +607,13 @@ namespace bbtk
   /// Connects the input <name> to the connection c
   void BlackBox::bbConnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
-			"BlackBox::bbConnectInput(\""<<name<<"\","<<c<<") ["
+    bbtkDebugMessage("connection",2,
+			"==> BlackBox::bbConnectInput(\""
+			<<name<<"\","<<c->GetFullName()<<") ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);       
+
+
     InputConnectorMapType::iterator i = bbGetInputConnectorMap().find(name);
     if (i==bbGetInputConnectorMap().end())
       {
@@ -562,9 +621,13 @@ namespace bbtk
       }
     i->second->SetConnection(c);
     
+    bbtkDebugMessage("connection",2,
+			"<== BlackBox::bbConnectInput(\""
+			<<name<<"\","<<c->GetFullName()<<") ["
+			<<bbGetFullName()<<"]"
+			<<std::endl);       
     //  bbSetModifiedStatus();
 
-    bbtkDebugDecTab("Core",7);
   }
   //=========================================================================
 
@@ -573,10 +636,11 @@ namespace bbtk
   /// Connects the output <name> to the connection c
   void BlackBox::bbConnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
-			"BlackBox::bbConnectOutput(\""<<name<<"\","<<c<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);       
-
+    bbtkDebugMessage("connection",2,
+		     "==> BlackBox::bbConnectOutput(\""<<name<<"\","
+		     <<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);       
+    
     OutputConnectorMapType::iterator i = bbGetOutputConnectorMap().find(name);
     if (i==bbGetOutputConnectorMap().end())
       {
@@ -584,7 +648,11 @@ namespace bbtk
       }
     i->second->SetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugMessage("connection",2,
+		     "<== BlackBox::bbConnectOutput(\""<<name<<"\","
+		     <<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);       
+
   }
   //=========================================================================
 
@@ -593,11 +661,19 @@ namespace bbtk
   /// Disconnects the input <name> from the connection c
   void BlackBox::bbDisconnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
-			"BlackBox::bbDisconnectInput(\""<<name
-			<<"\","<<c<<") ["
-			<<bbGetFullName()<<"]"
-			<<std::endl);      
+
+    bbtkDebugMessage("connection",2,
+		     "==> BlackBox::bbDisconnectInput(\""<<name
+		     <<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);      
+
+    if (!c) 
+      {
+
+	bbtkDebugMessage("connection",2,"c==0"<<std::endl);	
+	return;
+      }
 
     InputConnectorMapType::iterator i = bbGetInputConnectorMap().find(name);
     if (i==bbGetInputConnectorMap().end())
@@ -606,7 +682,12 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugMessage("connection",2,
+		     "<== BlackBox::bbDisconnectInput(\""<<name
+		     <<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);      
+
   }
   //=========================================================================
 
@@ -615,11 +696,17 @@ namespace bbtk
   /// Disconnects the output <name> from the connection c
   void BlackBox::bbDisconnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
-			"BlackBox::bbDisconnectOutput(\""<<name
-			<<"\","<<c<<") ["
-			<<bbGetFullName()<<"]"
-			<<std::endl);       
+    bbtkDebugMessage("connection",2,
+		     "==> BlackBox::bbDisconnectOutput(\""<<name
+		     <<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);       
+    if (!c) 
+      {
+
+	bbtkDebugMessage("connection",2,"c==0"<<std::endl);	
+	return;
+      }
 
     OutputConnectorMapType::iterator i = bbGetOutputConnectorMap().find(name);
     if (i==bbGetOutputConnectorMap().end())
@@ -628,7 +715,11 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugMessage("connection",2,
+		     "<== BlackBox::bbDisconnectOutput(\""<<name
+		     <<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);       
   } 
   //=========================================================================
  
@@ -649,28 +740,40 @@ namespace bbtk
     // Looks for the adaptor
     if (bbGetOutputType(output).name() != typeid(std::string).name() ) 
       {
-	BlackBox* a = 0;
-	try
+	// Look for factory 
+	Package::Pointer p = bbGetDescriptor()->GetPackage();
+	if ((p != 0) && ( ! p->GetFactorySet().empty() ) )
 	  {
-	    a = NewAdaptor(  
-			   bbGetOutputType(output),
-			   typeid(std::string),
-			   "");
-	  } catch (bbtk::Exception e) 
+	    Factory::Pointer f = p->GetFactorySet().begin()->lock();
+	    BlackBox::Pointer a;
+	    try
+	      {
+		a = f->NewAdaptor(  
+				  bbGetOutputType(output),
+				  typeid(std::string),
+				  "");
+	      } catch (bbtk::Exception e) 
+	      {
+	      }
+	    if (a){
+	      //			bbUpdate();
+	      a->bbSetInput("In",bbGetOutput(output));
+	      a->bbExecute();
+	      v = a->bbGetOutput("Out").unsafe_get<std::string>() ;
+	    } else {
+	      v="? (no adaptor found)";
+	    }
+	  }
+	else 
 	  {
+	    v="? (no factory found)";
 	  }
-	if (a!=NULL){
-	  //			bbUpdate();
-	  a->bbSetInput("In",bbGetOutput(output));
-	  a->bbExecute();
-	  v = a->bbGetOutput("Out").unsafe_get<std::string>() ;
-	} else {
-	  v="? (no adaptor found)";
-	}
-      } else {
-      //         bbUpdate();
-      v = bbGetOutput(output).unsafe_get<std::string>() ;
-    }
+      } 
+    else 
+      {
+	//         bbUpdate();
+	v = bbGetOutput(output).unsafe_get<std::string>() ;
+      }
     return v;
   }
   //=========================================================================
@@ -682,28 +785,38 @@ namespace bbtk
     // Looks for the adaptor
     if (bbGetInputType(input) != typeid(std::string)) 
       {
-	BlackBox* a = 0;
-	try
-	  {
-	    a = NewAdaptor(  
-			   bbGetInputType(input),
-			   typeid(std::string),
-			   "");
-	  }catch (bbtk::Exception e) 
-	  {
-	  }
-	if (a!=NULL)
+	// Look for factory 
+	Package::Pointer p = bbGetDescriptor()->GetPackage();
+	if ((p != 0) && ( ! p->GetFactorySet().empty() ) )
 	  {
-	    //			bbUpdate();
-	    a->bbSetInput("In",bbGetInput(input));
-	    a->bbExecute();
-	    v = a->bbGetOutput("Out").unsafe_get<std::string>() ;
+	    Factory::Pointer f = p->GetFactorySet().begin()->lock();
+	    BlackBox::Pointer a;
+	    try
+	      {
+		a = f->NewAdaptor(  
+			       bbGetInputType(input),
+			       typeid(std::string),
+			       "");
+	      }catch (bbtk::Exception e) 
+	      {
+	      }
+	    if (a)
+	      {
+		//			bbUpdate();
+		a->bbSetInput("In",bbGetInput(input));
+		a->bbExecute();
+		v = a->bbGetOutput("Out").unsafe_get<std::string>() ;
+	      } 
+	    else 
+	      {
+		v="? (no adaptor found)";
+	      }
 	  } 
 	else 
 	  {
-	    v="? (no adaptor found)";
+	    v="? (no factory found)";
 	  }
-      } 
+      }
     else 
       {
 	v = bbGetInput(input).unsafe_get<std::string>() ;
@@ -753,22 +866,24 @@ namespace bbtk
   //=========================================================================
   /// Write Graphviz-dot description in file
   void BlackBox::bbWriteDotFileBlackBox(FILE *ff,
-					BlackBox *parentblackbox, 
+					BlackBox::Pointer parentblackbox, 
 					int detail, int level,
 					bool instanceOrtype,
 					bool relative_link )
 
-  {
+  { 
     InputConnectorMapType::iterator i;
     // label
     std::string labelStr;
     std::string valueStr("");
-    if (detail==0)
-      {
-	labelStr = bbGetName() ; 
-      } else {
-      labelStr = bbGetName();
-      labelStr = labelStr + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]  ";
+
+	if (detail==0) {
+		labelStr = bbGetName() ; 
+//EED 18 Fev 2008
+		labelStr = labelStr + "\\n[" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]";
+	} else {
+		labelStr = bbGetName();
+		labelStr = labelStr + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]  ";
     }
 
     SubsBrackets(labelStr);
@@ -834,26 +949,26 @@ namespace bbtk
     //    std::cout  << labelStr << std::endl;
 
     // Relation Input
-    if (this!=parentblackbox){
+    if (GetThisPointer<BlackBox>()!=parentblackbox){
       for ( i = mInputConnectorMap.begin(); i != mInputConnectorMap.end(); ++i ) 
 	{
 	  if (i->second)
 	    {
 	      Connection* con = i->second->GetConnection();
 	      if (con!=NULL){
-		BlackBox *a=con->GetBlackBoxFrom();
-		BlackBox *b=con->GetBlackBoxTo();
+		BlackBox::Pointer a=con->GetOriginalBlackBoxFrom();
+		BlackBox::Pointer b=con->GetOriginalBlackBoxTo();
 		fprintf(ff,"  ");
 		a->bbWriteDotInputOutputName(ff,false,detail,level);
 		if (detail==1)
 		  {
-		    fprintf(ff,":%s",con->GetBlackBoxFromOutput().c_str());
+		    fprintf(ff,":%s",con->GetOriginalBlackBoxFromOutput().c_str());
 		  }
 		fprintf(ff,"->");
 		b->bbWriteDotInputOutputName(ff,true,detail,level);
 		if (detail==1)
 		  {
-		    fprintf(ff,":%s",con->GetBlackBoxToInput().c_str());
+		    fprintf(ff,":%s",con->GetOriginalBlackBoxToInput().c_str());
 		  }
 		fprintf(ff,"%s\n",";");
 	      }  // if con
@@ -867,7 +982,7 @@ namespace bbtk
 
 
   //=========================================================================
-  void BlackBox::bbShowRelations(BlackBox *parentblackbox, 
+  void BlackBox::bbShowRelations(BlackBox::Pointer parentblackbox, 
 				 int detail, int level
 				 /*,Factory *factory*/ )
   {
@@ -902,9 +1017,9 @@ namespace bbtk
 	std::string s("");
 	Connection* con = i->second->GetConnection();
 	if (con!=0){
-	  s = con->GetBlackBoxFrom()->bbGetName();
+	  s = con->GetOriginalBlackBoxFrom()->bbGetName();
 	  s += ".";
-	  s += con->GetBlackBoxFromOutput();
+	  s += con->GetOriginalBlackBoxFromOutput();
 	}  // if con
 	iconn.push_back(s);
       }
@@ -919,14 +1034,15 @@ namespace bbtk
 	ovalue.push_back(bbGetOutputAsString(o->first));
 	if (ovalue.back().size()>valuelmax) valuelmax = ovalue.back().size();
 	std::vector<std::string> ss;
-	const std::vector<Connection*>& con = o->second->GetConnectionVector();
+	const std::vector<Connection*>& con 
+	  = o->second->GetConnectionVector();
 	std::vector<Connection*>::const_iterator c;
 	for (c=con.begin();c!=con.end();++c) 
 	  {
 	    std::string s;
-	    s = (*c)->GetBlackBoxTo()->bbGetName();
+	    s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
 	    s += ".";
-	    s += (*c)->GetBlackBoxToInput();
+	    s += (*c)->GetOriginalBlackBoxToInput();
 	    ss.push_back(s);
 	}  // if con
 	oconn.push_back(ss);
@@ -991,22 +1107,22 @@ namespace bbtk
   //=========================================================================
    void BlackBox::bbGlobalProcessExecutionList()
    {   
-     bbtkDebugMessageInc("Process",1,
+     bbtkDebugMessageInc("process",3,
 			 "=> BlackBox::bbGlobalProcessExecutionList()"
 			 <<std::endl);     
      
-     std::set<BlackBox*>::iterator i;
+     std::set<BlackBox::Pointer>::iterator i;
      for (i=bbmgExecutionList.begin();
 	  i!=bbmgExecutionList.end();
 	  ++i)
        {
-	 bbtkDebugMessage("Process",2,
+	 bbtkDebugMessage("process",4,
 			  " -> Executing "<<(*i)->bbGetFullName()<<std::endl);
 	 (*i)->bbExecute(true);
        }
      
      bbmgExecutionList.clear();
-     bbtkDebugMessageDec("Process",1,
+     bbtkDebugMessageDec("process",3,
 			 "<= BlackBox::bbGlobalProcessExecutionList()"
 			 <<std::endl);     
      
@@ -1014,13 +1130,50 @@ namespace bbtk
    }
   //=========================================================================
 
+    bool BlackBox::bbGlobalGetSomeBoxExecuting()
+	{ 
+		return bbmgSomeBoxExecuting; 
+	}
+
+    void BlackBox::bbGlobalSetSomeBoxExecuting(bool b) 
+	{ 
+		bbmgSomeBoxExecuting = b; 
+	}
+
+    void BlackBox::bbGlobalSetFreezeExecution(bool b) 
+	{ 
+		bbmgFreezeExecution = b;
+	}
+
+    bool BlackBox::bbGlobalGetFreezeExecution() 
+	{ 
+		return bbmgFreezeExecution; 
+	}
+
+  void BlackBox::bbGlobalAddToExecutionList( BlackBox::Pointer b )
+	{  
+		bbmgExecutionList.insert(b); 
+	} 
+
+
   //=========================================================================
   // Static members initialization
+/*EED
   bool BlackBox::bbmgSomeBoxExecuting = false;
   bool BlackBox::bbmgFreezeExecution = false;
   std::set<BlackBox*> BlackBox::bbmgExecutionList;
+*/
    //=========================================================================
 
+  //=========================================================================
+  void BlackBox::Check(bool recursive)
+  {
+    bbtkMessage("debug",1,"*** Checking Black Box "<<(void*)this<<" ["<<bbGetFullName()
+		<<"] ... OK"<<std::endl);
+  }
+  //=========================================================================
+
+
 
 }  // EO namespace bbtk