X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBox.cxx;h=f692435687233e6a03f5e17e4d707929ef96f449;hb=5d503ab0e50fbae3cd2ebd26e6c815557abbe42e;hp=ec6f1c313ff1ab39642e347903fa14ec081b6f98;hpb=71376d8384d5d21b5c56d36ecc8cbf31315c039a;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index ec6f1c3..f692435 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/02/05 13:23:46 $
-Version:   $Revision: 1.2 $
+Date:      $Date: 2008/04/24 11:49:59 $
+Version:   $Revision: 1.19 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See Doc/License.txt or
@@ -29,19 +29,37 @@ PURPOSE.  See the above copyright notices for more information.
 namespace bbtk
 {
 
+  //==========================================================================
+  /// Creates a new complex black box
+  ComplexBlackBox::Pointer ComplexBlackBox::New(const std::string& name,
+						ComplexBlackBoxDescriptor::Pointer desc)
+  {
+    bbtkDebugMessage("object",1,"##> ComplexBlackBox::New('"<<name<<"','"<<
+		     desc->GetTypeName()<<"')" <<bbtkendl);
+    ComplexBlackBox::Pointer p = 
+      MakeBlackBoxPointer(new ComplexBlackBox(name,desc));
+    bbtkDebugMessage("object",2,"<## ComplexBlackBox::New('"<<name<<"','"<<
+		     desc->GetTypeName()<<"')" <<bbtkendl);
+    return p;
+  }
+  //==========================================================================
 
   //=======================================================================
   /// Usefull constructor 
   ComplexBlackBox::ComplexBlackBox(const std::string &name,
-				   ComplexBlackBoxDescriptor* desc)
-    : BlackBox(name),
-      mDescriptor(desc)
+				   ComplexBlackBoxDescriptor::Pointer desc)
+    : 
+    BlackBox(name),
+    mLockedDescriptor(desc),
+    mDescriptor(desc)
   {
-    bbtkDebugMessageInc("Kernel",9,
-    			"ComplexBlackBox::ComplexBlackBox(\""
-			<<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",3,
+		     "##> ComplexBlackBox::ComplexBlackBox(\""
+		     <<name<<"\")"<<std::endl);
     bbAllocateConnectors();
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("object",3,
+		     "<## ComplexBlackBox::ComplexBlackBox(\""
+		     <<name<<"\")"<<std::endl);
   }
   //=======================================================================
 
@@ -50,49 +68,56 @@ namespace bbtk
   ComplexBlackBox::ComplexBlackBox(ComplexBlackBox& from, 
 				   const std::string &name)
     : BlackBox(from,name),
+      // The locked descriptor is copied from the unlocked one 
+      // to make the box a non-prototype !!
+      mLockedDescriptor(from.mDescriptor),
       mDescriptor(from.mDescriptor),
      mExecutionList(from.mExecutionList)    
   {
-    bbtkDebugMessageInc("Kernel",9,
-    			"ComplexBlackBox::ComplexBlackBox(\""
+    bbtkDebugMessage("object",3,
+    			"##> ComplexBlackBox::ComplexBlackBox(\""
 			<<from.bbGetName()<<"\",\""
 			<<name<<"\")"<<std::endl);
+    bbtkDebugMessage("object",4,"  * Cloning Black Boxes"<<std::endl);
+
+    // We have to make the shared_ptr on this because it is used 
+    // in bbUnsafeAddBlackBox !
+    MakeBlackBoxPointer(this,true);
 
-    bbtkDebugMessageInc("Kernel",9,"* Cloning Black Boxes"<<std::endl);
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
       {
-	bbtkDebugMessageInc("Kernel",9,"* Cloning \""<<i->first<<"\""<<std::endl);
-	BlackBox* B = i->second->bbClone(i->second->bbGetName());
+	bbtkDebugMessageInc("object",5,"    * Cloning \""<<i->first<<"\""<<std::endl);
+	BlackBox::Pointer B = i->second->bbClone(i->second->bbGetName());
 	bbUnsafeAddBlackBox(B);
-	
-	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Kernel",9);
    
-    bbtkDebugMessageInc("Kernel",9,"* Cloning Connections"<<std::endl);
+    bbtkDebugMessage("object",4,"  * Cloning Connections"<<std::endl);
     ConnectionListType::const_iterator j;
     for ( j = from.mConnectionList.begin(); j != from.mConnectionList.end(); ++j ) 
       {
-	bbtkDebugMessageInc("Kernel",9,"* Cloning \""<<
-			    (*j)->GetFullName()<<"\""<<std::endl);
+	bbtkDebugMessage("object",5,"    * Cloning \""<<
+			 (*j)->GetFullName()<<"\""<<std::endl);
+
+	BlackBox::Pointer bbfrom = bbGetBlackBox( (*j)->GetOriginalBlackBoxFrom()->bbGetName() );
+	BlackBox::Pointer bbto = bbGetBlackBox( (*j)->GetOriginalBlackBoxTo()->bbGetName() );
 
-	BlackBox* bbfrom = bbGetBlackBox( (*j)->GetBlackBoxFrom()->bbGetName() );
-	BlackBox* bbto = bbGetBlackBox( (*j)->GetBlackBoxTo()->bbGetName() );
-	Connection* c = /*mDescriptor->GetFactory()->Create*/ 
+	Connection::Pointer c = mDescriptor.lock()->GetFactory()-> 
 	  NewConnection( bbfrom, 
-			 (*j)->GetBlackBoxFromOutput(), 
+			 (*j)->GetOriginalBlackBoxFromOutput(), 
 			 bbto, 
-			 (*j)->GetBlackBoxToInput() );
+			 (*j)->GetOriginalBlackBoxToInput() );
 	
+	//c->Check();
 	bbAddConnection(c);
 
-	bbtkDebugDecTab("Kernel",9);
       }
-    bbtkDebugDecTab("Kernel",9);
 
     bbAllocateConnectors();
-    bbtkDebugDecTab("Kernel",9);    
+    bbtkDebugMessage("object",3,
+    			"<## ComplexBlackBox::ComplexBlackBox(\""
+			<<from.bbGetName()<<"\",\""
+			<<name<<"\")"<<std::endl);
   }
   //=======================================================================
 
@@ -100,39 +125,26 @@ namespace bbtk
   ///  Destructor
   ComplexBlackBox::~ComplexBlackBox()
   {
-    bbtkDebugMessageInc("Kernel",9,
-			"ComplexBlackBox::~ComplexBlackBox() ["
-			<<bbGetFullName()<<"]"<<std::endl);
-    
-    bbtkDebugMessageInc("Kernel",9,"* Delete Connections"<<std::endl);
-    ConnectionListType::iterator j;
-    for ( j = mConnectionList.begin(); j != mConnectionList.end(); ++j ) 
-      {
-	bbtkDebugMessageInc("Kernel",9,"* Delete \""<<
-			    (*j)->GetFullName()<<"\""<<std::endl);
-	delete *j;
-	bbtkDebugDecTab("Kernel",9);
-      }
-    bbtkDebugDecTab("Kernel",9);
-
-    
-    bbtkDebugMessageInc("Kernel",9,"* Delete Black Boxes"<<std::endl);
-    BlackBoxMapType::iterator i;
-    for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i ) 
-      {
-	bbtkDebugMessageInc("Kernel",9,"* Delete \""<<i->first<<"\""<<std::endl);
-	i->second->bbDelete();
-	bbtkDebugDecTab("Kernel",9);
-      }
-    bbtkDebugDecTab("Kernel",9);
-    //    bbtkDebugMessage("Kernel",9,"EO ComplexBlackBox::~ComplexBlackBox  ["
-    //		     <<bbGetFullName()<<"]"<<std::endl);
-
-    
+    bbtkDebugMessage("object",3,
+		     "==> ComplexBlackBox::~ComplexBlackBox() ["
+		     <<bbGetName()<<"]"<<std::endl);
+
+    bbtkDebugMessage("object",4,
+		     " -> Releasing connections"<<std::endl);
+    mConnectionList.clear();
+    bbtkDebugMessage("object",4,
+		     " -> Releasing boxes"<<std::endl);
+    mBlackBoxMap.clear();
+
+    //    Clear();
     this->bbDesallocateConnectors();
-    bbtkDebugDecTab("Kernel",9);   
+
+    bbtkDebugMessage("object",3,
+		     "<== ComplexBlackBox::~ComplexBlackBox() ["
+		     <<bbGetName()<<"]"<<std::endl);
   } 
   //=======================================================================
+ 
 
   //=========================================================================
   /// Allocates the i/o connectors of the black box
@@ -142,7 +154,7 @@ namespace bbtk
 			"ComplexBlackBox::bbAllocateConnectors() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);	
-
+    
     // Input connectors
     const BlackBoxDescriptor::InputDescriptorMapType& imap 
       = bbGetDescriptor()->GetInputDescriptorMap(); 
@@ -160,7 +172,6 @@ namespace bbtk
 	  ->bbGetInputConnectorMap()[ d->GetInput() ];
 	
 	bbGetInputConnectorMap()[i->second->GetName()] = c;
-//new BlackBoxInputConnector();
       }									
 
     // Output connectors
@@ -180,8 +191,8 @@ namespace bbtk
 	  ->bbGetOutputConnectorMap()[ d->GetOutput() ];
 
 	bbGetOutputConnectorMap()[o->second->GetName()] = c;
-	//new BlackBoxOutputConnector();
       }
+    
     bbtkDebugDecTab("Kernel",8);  
   }
   //=========================================================================
@@ -208,17 +219,14 @@ namespace bbtk
   //=========================================================================
 
   //=======================================================================
-  BlackBox* ComplexBlackBox::bbClone(const std::string& name)
+  BlackBox::Pointer ComplexBlackBox::bbClone(const std::string& name)
   {
     bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::bbClone(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
     ComplexBlackBox* CBB = new ComplexBlackBox(*this,name);
-    
-    bbtkDebugDecTab("Kernel",9);   
-
-    return CBB;
+    return MakeBlackBoxPointer(CBB);
   }
   //=======================================================================
 
@@ -227,11 +235,12 @@ namespace bbtk
   /// Executes the box so that its outputs are up-to-date on exit
   void ComplexBlackBox::bbExecute(bool force)
   {
-    bbtkDebugMessageInc("Process",1,
-			"ComplexBlackBox::bbExecute() ["
+    bbtkDebugMessageInc("process",2,
+			"=> ComplexBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
-    wx::BeginBusyCursor();
+
+    Wx::BeginBusyCursor();
     
     if (mExecutionList.size() != 0) 
       {
@@ -241,22 +250,21 @@ namespace bbtk
 	     i!=mExecutionList.end();
 	     ++i) 
 	  {
-	    bbtkDebugMessage("Process",2," -> Executing '"<<*i<<"'"<<std::endl);
+	    bbtkDebugMessage("process",3," -> Executing '"<<*i<<"'"<<std::endl);
 	    mBlackBoxMap[*i]->bbExecute(force);
 	  }
       }
     else 
       {
-	std::map<std::string, BlackBox*>::iterator i;
+	std::map<std::string, BlackBox::Pointer>::iterator i;
 	for (i=mBlackBoxMap.begin(); i!=mBlackBoxMap.end(); ++i)
 	  {
 	    i->second->bbExecute(force);
 	  }
       } 
 
-    wx::EndBusyCursor();
+    Wx::EndBusyCursor();
     
-    bbtkDebugDecTab("Process",1);
     
   }
   //==================================================================
@@ -264,15 +272,17 @@ namespace bbtk
   //==================================================================
   void ComplexBlackBox::bbSetModifiedStatus(BlackBoxInputConnector* c)
   {
-    bbtkDebugMessage("Process",3,
-			"ComplexBlackBox::bbSetModifiedStatus("
+    bbtkDebugMessage("modified",1,
+			"==> ComplexBlackBox::bbSetModifiedStatus("
 		     <<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
 
     c->GetBlackBox()->bbSetModifiedStatus(c);
 
-    bbtkDebugMessage("Process",3,
-		     "EO ComplexBlackBox::bbSetModifiedStatus("
+    /*
+    bbtkDebugMessage("modified",1,
+		     "<== ComplexBlackBox::bbSetModifiedStatus("
 		     <<c<<") ["<<bbGetFullName()<<"]"<<std::endl);
+    */
   }
   //==================================================================
 
@@ -292,11 +302,27 @@ namespace bbtk
   //==================================================================
 
   //==================================================================
-  IOStatus ComplexBlackBox::bbBackwardUpdate(Connection* caller)
+  IOStatus ComplexBlackBox::bbBackwardUpdate(Connection::Pointer caller)
   {
-    bbtkDebugMessageInc("Process",1,
-			"ComplexBlackBox::bbBackwardUpdate("<<caller->GetFullName()<<") ["
+    bbtkDebugMessageInc("process",3,
+			"==> ComplexBlackBox::bbBackwardUpdate("
+			<<(caller?caller->GetFullName():"0")<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
+    //    bbtkInternalError("ComplexBlackBox::bbBackwardUpdate should never be called !");
+    
+    if (caller==0)
+      {
+	bbtkInternalError("ComplexBlackBox::bbBackwardUpdate called with caller=0");
+      }
+
+    /*
+    std::cout << "CBB BUP : "<<caller->GetBlackBoxFrom()->bbGetFullName()
+	      <<"."<<caller->GetBlackBoxFromOutput()<<"----"
+	      <<caller->GetOriginalBlackBoxFrom()->bbGetFullName()
+	      <<"."<<caller->GetOriginalBlackBoxFromOutput()<<std::endl;
+    */
+      
+
 
     IOStatus s = UPTODATE;
     const BlackBoxDescriptor::OutputDescriptorMapType& omap 
@@ -309,55 +335,39 @@ namespace bbtk
 	ComplexBlackBoxOutputDescriptor* d = 
 	  (ComplexBlackBoxOutputDescriptor*)i->second;
 	// Get the internal box 
-	BlackBox* b = bbUnsafeGetBlackBox ( d->GetTarget() );
+	BlackBox::Pointer b = bbUnsafeGetBlackBox ( d->GetTarget() );
 	// Calls BackwardUpdate on it
-	bbtkDebugMessageInc("Process",2,"Internal box connected to output : "<<d->GetTarget()<<std::endl);
+	bbtkDebugMessageInc("process",4,"Internal box connected to output : "<<d->GetTarget()<<std::endl);
+	// Because internal box can also be a complex box we have to 
+	// temporarily change the connection BlackBoxFromOutput to the 
+	// mapped one
+	
+	//	std::string oldout = caller->GetBlackBoxFromOutput();
+	//	std::cout << "oldout = "<<oldout<<std::endl;
+	//	std::cout << "tmpout = "<<d->GetOutput()<<std::endl;
+	//	caller->SetBlackBoxFromOutput(d->GetOutput());
+	//
+	//Connection newcaller(*caller);
+	//newcaller.SetBlackBoxFromOutput(d->GetOutput());
+	//IOStatus s1 = b->bbBackwardUpdate(&newcaller);
 	IOStatus s1 = b->bbBackwardUpdate(caller);
+	//newcaller.Clear();
+	// restore old output
+	//	caller->SetBlackBoxFromOutput(oldout);
+
 	// ??? STATUS OF CBBs ???
 	// ??? Here it is only the final status of the boxes connected to the output 
 	if (s1==MODIFIED) s=MODIFIED;
-	bbtkDebugDecTab("Process",2);
       }
     else 
       {
 	bbtkError("Connection '"<<caller->GetFullName()<<"' does not point to a valid output of the complex box !");
       }
-    bbtkDebugDecTab("Process",1);
-    return s;
-  }
-  //==================================================================
-  
-  /*
-  //==================================================================
-  void ComplexBlackBox::bbForwardUpdate(Connection* caller)
-  { 
-    bbtkDebugMessageInc("Process",1,
-			"ComplexBlackBox::bbForwardUpdate("<<caller->GetFullName()<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
 
-    const BlackBoxDescriptor::InputDescriptorMapType& imap 
-      = bbGetDescriptor()->GetInputDescriptorMap(); 
-    BlackBoxDescriptor::InputDescriptorMapType::const_iterator i 
-      = imap.find(caller->GetBlackBoxToInput());
-    if (i!=imap.end())
-      {	
-	// Cast the BBOutputDescriptor into a ComplexBBOutputDescriptor
-	ComplexBlackBoxInputDescriptor* d = 
-	  (ComplexBlackBoxInputDescriptor*)i->second;
-	// Get the internal box 
-	BlackBox* b = bbUnsafeGetBlackBox ( d->GetTarget() );
-	// Calls ForwardUpdate on it
-	bbtkDebugMessage("Process",2,"-> Internal box connected to input : "<<d->GetTarget()<<std::endl);
-	b->bbForwardUpdate(caller);
-      }
-    else 
-      {
-	bbtkError("Connection '"<<caller->GetFullName()<<"' does not point to a valid input of the complex box !");
-      }
-    bbtkDebugDecTab("Process",1);
+    return s;
+    
   }
   //==================================================================
-  */
 
 
   //==================================================================
@@ -457,9 +467,73 @@ namespace bbtk
   }
   //==================================================================
 
+  //=========================================================================
+  /// Connects the input <name> to the connection c
+  void ComplexBlackBox::bbConnectInput( const std::string& name, Connection* c)
+  {
+    bbtkDebugMessage("connection",2,
+		     "==> ComplexBlackBox::bbConnectInput(\""
+		     <<name<<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);       
+    
+   ComplexBlackBoxInputDescriptor* d = (ComplexBlackBoxInputDescriptor*)
+      bbGetDescriptor()->GetInputDescriptor(name);
+
+
+   BlackBox::Pointer t = bbGetBlackBox(d->GetTarget());
+
+   bbtkDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
+
+   c->SetBlackBoxTo(t);
+   c->SetBlackBoxToInput(d->GetInput());
+
+   bbtkDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
+   t->bbConnectInput(d->GetInput(),c);
+
+   bbtkDebugMessage("connection",2,
+		     "<== ComplexBlackBox::bbConnectInput(\""
+		     <<name<<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"
+		     <<std::endl);       
+  }
+  //=========================================================================
+
+
+  //=========================================================================  
+  /// Connects the output <name> to the connection c
+  void ComplexBlackBox::bbConnectOutput( const std::string& name, Connection* c)
+  {
+    bbtkDebugMessage("connection",2,
+		     "==> ComplexBlackBox::bbConnectOutput(\""
+		     <<name<<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);       
+
+   ComplexBlackBoxOutputDescriptor* d = (ComplexBlackBoxOutputDescriptor*)
+      bbGetDescriptor()->GetOutputDescriptor(name);
+
+   BlackBox::Pointer t = bbGetBlackBox(d->GetTarget());
+ 
+  bbtkDebugMessage("connection",2," - Target = "<<d->GetTarget()<<" = "<<t->bbGetFullName()<<std::endl);
+
+   c->SetBlackBoxFrom(t);
+   c->SetBlackBoxFromOutput(d->GetOutput());
+
+   bbtkDebugMessage("connection",2," - New conn = "<<c->GetFullName()<<std::endl);
+
+   t->bbConnectOutput(d->GetOutput(),c);
+  
+    bbtkDebugMessage("connection",2,
+		     "<== ComplexBlackBox::bbConnectOutput(\""
+		     <<name<<"\","<<c->GetFullName()<<") ["
+		     <<bbGetFullName()<<"]"<<std::endl);       
+  }
+  //=========================================================================
+
+
   //==================================================================
   /// Adds the black box to the complex box
-  void ComplexBlackBox::bbAddBlackBox( BlackBox* b)
+  void ComplexBlackBox::bbAddBlackBox( BlackBox::Pointer b)
   {
     bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::AddBlackBox(\""<<b->bbGetName()
@@ -471,7 +545,7 @@ namespace bbtk
 	bbtkError("a black box called \""<<b->bbGetName()
 		  <<"\" already exists");
       }
-    b->bbSetParent(this);
+    b->bbSetParent(GetThisPointer<ComplexBlackBox>());
     mBlackBoxMap[b->bbGetName()] = b;
 
     bbtkDebugDecTab("Kernel",7);
@@ -480,14 +554,14 @@ namespace bbtk
 
   //==================================================================
   /// Adds the black box to the complex box (unsafe)
-  void ComplexBlackBox::bbUnsafeAddBlackBox( BlackBox* b)
+  void ComplexBlackBox::bbUnsafeAddBlackBox( BlackBox::Pointer b)
   {
     bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::UnsafeAddBlackBox(\""<<b->bbGetName()
 			<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
     
-    b->bbSetParent(this);
+    b->bbSetParent(GetThisPointer<ComplexBlackBox>());
     mBlackBoxMap[b->bbGetName()] = b;
 
     bbtkDebugDecTab("Kernel",7);
@@ -496,13 +570,39 @@ namespace bbtk
 
   //==================================================================
   /// Removes the black box from the complex box
-  void ComplexBlackBox::bbRemoveBlackBox( const std::string& name )
+  void ComplexBlackBox::bbRemoveBlackBox( const std::string& name, 
+					  bool remove_connections )
   {
     bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::RemoveBlackBox(\""<<name<<"\") ["
 			<<bbGetFullName()<<"]"<<std::endl);  
 
-    bbtkError("ComplexBlackBox::RemoveBlackBox not implemented");
+    BlackBoxMapType::iterator i = mBlackBoxMap.find(name);
+    if ( i == mBlackBoxMap.end() ) 
+      {
+	bbtkError("the black box \""<<name<<"\" does not exist");
+      }
+    BlackBox::WeakPointer p = i->second;
+    
+    if (remove_connections)
+      {
+	ConnectionListType::const_iterator j;
+	for ( j = mConnectionList.begin(); 
+	      j != mConnectionList.end(); ++j ) 
+	  {
+	    (*j)->Check();
+	  }
+      }
+    if (p.use_count()!=1) 
+      {
+	bbtkError("the black box \""<<name<<"\" is still connected");
+      }
+    
+    mBlackBoxMap.erase(i);
+    
+
+    // Unload orphan dl packages 
+    Package::UnLoadReleasedDynamicallyLoadedPackages();
 
     bbtkDebugDecTab("Kernel",7);
   }
@@ -510,7 +610,7 @@ namespace bbtk
 
   //==================================================================
   /// Adds the connection to the complex box
-  void ComplexBlackBox::bbAddConnection( Connection* c)
+  void ComplexBlackBox::bbAddConnection( Connection::Pointer c)
   {
     bbtkDebugMessageInc("Kernel",7,
 			"ComplexBlackBox::AddConnection(\""<<"..."<<"\") ["
@@ -525,7 +625,7 @@ namespace bbtk
 
   //==================================================================
   /// Returns the black box with name <name>
-  BlackBox* ComplexBlackBox::bbGetBlackBox( const std::string& name )
+  BlackBox::Pointer ComplexBlackBox::bbGetBlackBox( const std::string& name )
   {
     bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::GetBlackBox(\""<<name<<"\") ["
@@ -545,7 +645,7 @@ namespace bbtk
   //==================================================================
   /// Returns the black box with name <name> : does not throw an exception 
   /// if it does not exist but return a null pointer
-  BlackBox* ComplexBlackBox::bbUnsafeGetBlackBox( const std::string& name )
+  BlackBox::Pointer ComplexBlackBox::bbUnsafeGetBlackBox( const std::string& name )
   {
     bbtkDebugMessageInc("Kernel",9,
 			"ComplexBlackBox::UnsafeGetBlackBox(\""<<name<<"\") ["
@@ -556,7 +656,7 @@ namespace bbtk
     if ( i == mBlackBoxMap.end() ) 
       {
 	bbtkDebugDecTab("Kernel",9);
-	return 0;
+	return BlackBox::Pointer();
       }
 
     bbtkDebugDecTab("Kernel",9);
@@ -600,9 +700,9 @@ namespace bbtk
 
 
   //=========================================================================
-  BlackBox *ComplexBlackBox::bbFindBlackBox(const std::string &blackboxname)
+  BlackBox::Pointer ComplexBlackBox::bbFindBlackBox(const std::string &blackboxname)
   {
-    BlackBox *blackbox=NULL;
+    BlackBox::Pointer blackbox;
     std::string subname="";
     std::string restname="";
     std::string delimiters(">");
@@ -616,20 +716,18 @@ namespace bbtk
     restname = blackboxname.substr(lastPos+pos - lastPos+1, 999);
 
     if (restname==subname)
-      {
-	restname="";
-      }
+    {
+	   restname="";
+    }
 
     BlackBoxMapType::iterator i = mBlackBoxMap.find(subname);
-    if ( i == mBlackBoxMap.end() ) 
-      {
-	blackbox = NULL;
-      } else {
-      blackbox = i->second;
-      if (restname!="")
-	{
-	  blackbox = blackbox->bbFindBlackBox(restname);
-	}
+    if ( i != mBlackBoxMap.end() ) 
+    {
+       blackbox = i->second;
+       if (restname!="")
+	    {
+	     blackbox = blackbox->bbFindBlackBox(restname);
+	    }
     }
     return blackbox;
   }
@@ -647,11 +745,11 @@ namespace bbtk
     std::string directory(output_dir);
 
     if (output_dir.length() == 0) 
-      {
-	// Don't pollute the file store with  "doc_tmp" directories ... 
-	std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_doc_tmp();
-	directory =  default_doc_dir + "/" + "doc_tmp";
-      }
+    {
+	   // Don't pollute the file store with  "temp_dir" directories ... 
+	   std::string default_temp_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
+	   directory =  default_temp_dir + "/" + "temp_dir";
+    }
     
     std::string simplefilename  (this->bbGetTypeName()+"_"+this->bbGetName());
     std::string simplefilename_png (simplefilename+".png");
@@ -677,7 +775,9 @@ namespace bbtk
     fprintf(ff,"rankdir=LR%s\n",";");
     fprintf(ff,"node [shape=record]%s\n",";");
 
-    this->bbWriteDotFileBlackBox(ff,this,detail,level,
+    this->bbWriteDotFileBlackBox(ff,
+				 GetThisPointer<ComplexBlackBox>(),
+				 detail,level,
 				 instanceOrtype,
 				 relative_link );
 
@@ -701,13 +801,13 @@ namespace bbtk
     char c;
     ff2=fopen(filename_cmap.c_str(),"r");
     while (!feof(ff2))
-      {
-	c=fgetc(ff2);
-	if (c!=-1)
-	  {
-	    (s) << c;
-	  }
-      }
+    {
+	   c=fgetc(ff2);
+	   if (c!=-1)
+	   {
+	      (s) << c;
+	   }
+    }
     (s) << "</map>\n\n";
     
     // End
@@ -718,48 +818,50 @@ namespace bbtk
   //=========================================================================
   /// Write Graphviz-dot description in file 
   void ComplexBlackBox::bbWriteDotFileBlackBox(FILE *ff,
-					       BlackBox *parentblackbox, 
+					       BlackBox::Pointer parentblackbox, 
 					       int detail, int level,
 					       bool instanceOrtype,
 					       bool relative_link )   
   {
     std::string tmp1;
     std::string valueStr("");
-    Package *package = this->bbGetDescriptor()->GetPackage(); 
+    Package::Pointer package = this->bbGetDescriptor()->GetPackage(); 
 
     if (package!=NULL)
-      {
-	if (relative_link)
-	  tmp1 = this->bbGetDescriptor()->GetPackage()->GetDocRelativeURL();
-	else 
-	  tmp1 = this->bbGetDescriptor()->GetPackage()->GetDocURL();
-      } 
+    {
+      if (relative_link)
+	     tmp1 = this->bbGetDescriptor()->GetPackage()->GetDocRelativeURL();
+	   else 
+	     tmp1 = this->bbGetDescriptor()->GetPackage()->GetDocURL();
+    } 
     else 
-      {
-	tmp1 = "Caspitas";
-      }
+    {
+	   tmp1 = "Caspitas";
+    }
 
     std::string tmp2=bbGetTypeName();
     std::string url(tmp1 + "#" + tmp2 );	
     fprintf( ff , "subgraph cluster_%s_%p {\n",bbGetName().c_str(),this);
 
     if (!(   (bbGetTypeName()=="workspace") && (bbGetName()=="workspacePrototype")) )
-      {
-	fprintf( ff , "  URL = \"%s\" %s",url.c_str(),";");
-      }
+    {
+	   fprintf( ff , "  URL = \"%s\" %s",url.c_str(),";");
+    }
 
     std::string boxname="["+bbGetTypeName()+"]";
-    if (this!=parentblackbox)
-      {
-	if (detail==0)
-	  {
-	    boxname=bbGetName();
-	  } else {
-	  boxname = bbGetName();
-	  boxname = boxname + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]";
-	}
+    if (GetThisPointer<ComplexBlackBox>()!=parentblackbox)
+    {
+       if (detail==0)
+	    {
+          boxname=bbGetName();
+       } 
+       else 
+       {
+          boxname = bbGetName();
+          boxname = boxname + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]";
+	    }
 
-      }
+    }
     fprintf( ff , "  label = \"%s\"%s\n",  boxname.c_str() ,";");
 
 
@@ -854,7 +956,9 @@ namespace bbtk
       {
 	if (level>-1)
 	  {
-	    j->second->bbWriteDotFileBlackBox(ff,parentblackbox,detail,
+	    j->second->bbWriteDotFileBlackBox(ff,
+					      parentblackbox,
+					      detail,
 					      level-1,
 					      instanceOrtype,
 					      relative_link);
@@ -881,7 +985,7 @@ namespace bbtk
 		fprintf(ff,":%s",cbbid->GetName().c_str() );
 	      }
 	    fprintf(ff,"->" );
-	    BlackBox *bb = bbGetBlackBox( cbbid->GetTarget() ); 
+	    BlackBox::Pointer bb = bbGetBlackBox( cbbid->GetTarget() ); 
 	    bb->bbWriteDotInputOutputName(ff,true,detail,level);
 	    if (detail==1)
 	      {
@@ -902,7 +1006,7 @@ namespace bbtk
 	  {
 	    ComplexBlackBoxOutputDescriptor *cbbod = (ComplexBlackBoxOutputDescriptor*)yy->second;
 	    fprintf(ff,"  ");
-	    BlackBox *bb = bbGetBlackBox( cbbod->GetTarget() ); 
+	    BlackBox::Pointer bb = bbGetBlackBox( cbbod->GetTarget() ); 
 	    bb->bbWriteDotInputOutputName(ff,false,detail,level);
 	    if (detail==1)
 	      {
@@ -922,7 +1026,7 @@ namespace bbtk
 
 
 	// Relation from the out side of this ComplexBlackBox with its Inputs
-    if (this!=parentblackbox) {
+    if (GetThisPointer<ComplexBlackBox>()!=parentblackbox) {
       for ( ii = bbGetInputConnectorMap().begin(); 
 	    ii != bbGetInputConnectorMap().end(); ++ii ) 
 	{
@@ -930,31 +1034,32 @@ namespace bbtk
 	    {
 	      Connection* con = ii->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
 	    } // if second
 	} // for
     } // if parentblackbox
-
   }
   //=========================================================================
+  
+
 
-  /*
 
+  /*
 
   //=======================================================================
   /// Generates the list of the packages of which its depends 
@@ -971,4 +1076,97 @@ namespace bbtk
   }
   //=======================================================================
   */
+
+  //=======================================================================
+  void ComplexBlackBox::Check(bool recursive)
+  {
+     bbtkMessage("debug",1,"**** Checking Complex Black Box "<<(void*)this
+		 <<" ["<<bbGetFullName()<<"]"<<std::endl);
+     
+     BlackBoxMapType::const_iterator i;
+     for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i ) 
+       {
+	 i->second->Check(recursive);
+       }
+     ConnectionListType::const_iterator j;
+     for ( j = mConnectionList.begin(); 
+	   j != mConnectionList.end(); ++j ) 
+       {
+	 (*j)->Check();
+       }
+     bbtkMessage("debug",1,"**** Checking Complex Black Box "<<(void*)this
+		 <<" ["<<bbGetFullName()<<"] ... OK"<<std::endl);
+  
+  }
+  //=======================================================================
+
+  //=========================================================================
+  /// Returns the name with the name of the parent prepended if any
+  std::string ComplexBlackBox::bbGetNameWithParent() const
+  {
+    if (!IsAPrototype()) return BlackBox::bbGetNameWithParent();
+    if (bbGetDescriptor()) 
+      {
+	return bbGetDescriptor()->GetFullTypeName() + ":" + bbGetName();
+      }
+    else 
+      {
+	return std::string(":") + bbGetName();
+      }
+  } 
+  //=========================================================================
+
+  //==========================================================================
+  std::string ComplexBlackBox::GetObjectName() const
+  {
+    return std::string("ComplexBlackBox '")+bbGetNameWithParent()
+      +std::string("'");
+  }
+  //==========================================================================
+  
+  //==========================================================================
+  std::string ComplexBlackBox::GetObjectInfo() const 
+  {
+    std::stringstream i;
+    i << "  - "<<mBlackBoxMap.size() << " boxes / "
+      <<mConnectionList.size() << " connections" << std::endl;
+    return i.str();
+  }
+  //==========================================================================
+
+  //==========================================================================
+  size_t  ComplexBlackBox::GetObjectSize() const 
+  {
+    size_t s = Superclass::GetObjectSize();
+    s += ComplexBlackBox::GetObjectInternalSize();
+    return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  ComplexBlackBox::GetObjectInternalSize() const 
+  {
+    size_t s = sizeof(ComplexBlackBox);
+    return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  ComplexBlackBox::GetObjectRecursiveSize() const 
+  {
+    size_t s = Superclass::GetObjectRecursiveSize();
+    s += ComplexBlackBox::GetObjectInternalSize();
+    BlackBoxMapType::const_iterator i;
+    for ( i = mBlackBoxMap.begin(); i != mBlackBoxMap.end(); ++i ) 
+      {
+	s += i->second->GetObjectRecursiveSize();
+      }
+    ConnectionListType::const_iterator j;
+    for ( j = mConnectionList.begin(); 
+	  j != mConnectionList.end(); ++j ) 
+      {
+	s += (*j)->GetObjectRecursiveSize();
+      }
+    return s;
+  }
+  //==========================================================================
+
 }