X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=b3ce70a0b00256df328d49f41fd87df6922cd0b0;hb=e6b2de923e0e69c303c7d18fb8a5c1970541bb3a;hp=50496582f7b9f544d80485495029085aea06c4c3;hpb=71376d8384d5d21b5c56d36ecc8cbf31315c039a;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 5049658..b3ce70a 100644
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 13:23:46 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/07/25 07:44:12 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -27,25 +27,48 @@
 
 namespace bbtk
 {
-  
+  //==================================================================
+  Connection::Pointer Connection::New(BlackBox::Pointer from, 
+				      const std::string& output,
+				      BlackBox::Pointer to, 
+				      const std::string& input ,
+				      const Factory::Pointer f  )
+  {
+    bbtkDebugMessage("object",1,"##> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    Connection::Pointer p = 
+      MakePointer(new Connection(from,output,to,input,f));
+    bbtkDebugMessage("object",1,"<## Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    return p;
+  }
+  //==================================================================
+
   //==================================================================
   /// Ctor with the black box from and to and their input and output.
 /// Check the input and output compatibility
-  Connection::Connection(BlackBox* from, const std::string& output,
-			 BlackBox* to, const std::string& input   )
-    : mAdaptor(0),
+Connection::Connection(BlackBox::Pointer from, const std::string& output,
+		       BlackBox::Pointer to, const std::string& input ,
+		       const Factory::Pointer f  )
+    : mAdaptor(),
+      mFactory(f),
       mFromAny(false),
       mToAny(false)
   {
-    bbtkDebugMessageInc("Kernel",7,"Connection::Connection(\""
-			<<from->bbGetName()<<"\",\""<<output<<"\",\""
-			<<to->bbGetName()<<"\",\""<<input<<"\")"
-			<<std::endl);    
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
 
-    mFrom = from;
-    mTo = to;
-    mInput = input;
-    mOutput = output;
     
 
     if (! from->bbHasOutput(output) )
@@ -61,7 +84,7 @@ namespace bbtk
 
     if (to->bbGetInputConnectorMap().find(input)->second->IsConnected())
       {
-	bbtkError("The input \""<<input<<"\" of the box \""<<to->bbGetTypeName()
+	bbtkError("The input \""<<input<<"\" of the box \""<<to->bbGetName()
 		  <<"\" is already connected");
       }
     
@@ -97,9 +120,10 @@ namespace bbtk
 	    std::string name;
 	    name = from->bbGetName() + "." + output + "-" 
 	      + to->bbGetName() + "." + input; 
-	    mAdaptor = NewAdaptor(from->bbGetOutputType(output),
-				  to->bbGetInputType(input),
-				  name);
+	    mAdaptor = mFactory.lock()
+	      ->NewAdaptor(from->bbGetOutputType(output),
+			   to->bbGetInputType(input),
+			   name);
 	    if (!mAdaptor)  
 	      {  
 		bbtkError("did not find any <"
@@ -111,29 +135,182 @@ namespace bbtk
 	  }
       }
 
-     // 
+
+    mFrom = from;
+    mOriginalFrom = from;
+    mTo = to;
+    mOriginalTo = to;
+    mInput = mOriginalInput = input;
+    mOutput = mOriginalOutput = output;
+
+     // Lock this pointer !!!
+    //Pointer p = MakePointer(this,true);
     from->bbConnectOutput(output,this);
     to->bbConnectInput(input,this);
+
     
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
   }
+ //==================================================================
+ 
+  //==================================================================
+  Connection::Pointer Connection::New(BlackBox::Pointer from, 
+				      const std::string& output,
+				      BlackBox::Pointer to, 
+				      const std::string& input )
+  {
+    bbtkDebugMessage("object",1,"##> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    Connection::Pointer p = 
+      MakePointer(new Connection(from,output,to,input));
+    bbtkDebugMessage("object",1,"<## Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    return p;
+  }
+  //==================================================================
 
   //==================================================================
-  
-  
+  /// Ctor with the black box from and to and their input and output.
+/// Check the input and output compatibility
+Connection::Connection(BlackBox::Pointer from, const std::string& output,
+		       BlackBox::Pointer to, const std::string& input )
+  : mAdaptor(),
+      mFactory(),
+      mFromAny(false),
+      mToAny(false)
+  {
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    
+
+    if (! from->bbHasOutput(output) )
+      {
+	bbtkError("The box \""<<from->bbGetTypeName()<<
+		  "\" has no output \""<<output<<"\"");
+      }
+    if (! to->bbHasInput(input) )
+      {
+	bbtkError("The box \""<<to->bbGetTypeName()<<
+		  "\" has no input \""<<input<<"\"");
+      } 
+
+    if (to->bbGetInputConnectorMap().find(input)->second->IsConnected())
+      {
+	bbtkError("The input \""<<input<<"\" of the box \""<<to->bbGetName()
+		  <<"\" is already connected");
+      }
+    
+    //  std::string t1 ( from->bbGetOutputType(output).name() );
+    //   std::string t2 ( to->bbGetInputType(input).name() );
+    // if  //( t1 != t2 ) 
+    if ( from->bbGetOutputType(output) !=
+	 to->bbGetInputType(input) )
+      {
+	if ( from->bbGetOutputType(output) == typeid(Data) )
+	  {
+	    bbtkWarning("Connection '"
+			<<GetFullName()
+			<<"' : '"<<from->bbGetName()<<"."<<output
+			<<"' is of type <"
+			<<HumanTypeName<Data>()
+			<<"> : type compatibility with '"
+			<<to->bbGetName()<<"."<<input
+			<<"' will be resolved at run time"
+			);
+	    mFromAny = true;
+	  }
+	else if (  to->bbGetInputType(input) == typeid(Data) )
+	  {   
+	    bbtkDebugMessage("Kernel",8," -> '"<<input<<"' type is "
+			     <<TypeName<Data>()<<" : can receive any data"
+			     <<std::endl);
+	    mToAny = true;
+	  }
+	else 
+	  {
+	    bbtkError("Connection created between different types without Factory provided");
+	  }
+      }
+
+
+    mFrom = from;
+    mOriginalFrom = from;
+    mTo = to;
+    mOriginalTo = to;
+    mInput = mOriginalInput = input;
+    mOutput = mOriginalOutput = output;
+
+     // Lock this pointer !!!
+    //Pointer p = MakePointer(this,true);
+    from->bbConnectOutput(output,this);
+    to->bbConnectInput(input,this);
+
+    
+    bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+  }
+ //==================================================================
+ 
   //==================================================================
   /// Dtor 
   Connection::~Connection()
   {
-    bbtkDebugMessageInc("Kernel",7,
-			"Connection::~Connection() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("object",2,
+		     "==> Connection::~Connection() ["
+		     <<GetFullName()<<"]"<<std::endl);
+
+    if (mAdaptor) mAdaptor.reset();
+    if (mFrom!=0) 
+      {
+	mFrom->bbDisconnectOutput(mOutput,this);
+	//				  GetThisPointer<Connection>());
+	mFrom.reset();
+      }
+    else 
+      {
+	bbtkInternalError("Connection::~Connection() : invalid initial box pointer");
+      }
+    if (mTo!=0) 
+      {
+	mTo->bbDisconnectInput(mInput,this);//   GetThisPointer<Connection>());
+	mTo.reset();
+      }
+    else 
+      {
+	bbtkInternalError("Connection::~Connection() : invalid final box pointer");
+      }
 
-    mFrom->bbDisconnectOutput(mOutput,this);
-    mTo->bbDisconnectInput(mInput,this);
-    if (mAdaptor) mAdaptor->bbDelete();
 
-    bbtkDebugDecTab("Kernel",7);
+    bbtkDebugMessage("object",2,
+		     "<== Connection::~Connection() ["
+		     <<GetFullName()<<"]"<<std::endl);
   }
   //==================================================================
   
@@ -141,19 +318,20 @@ namespace bbtk
   /// Backward Update
   IOStatus Connection::BackwardUpdate()
   {
-    bbtkDebugMessageInc("Process",2,
-			"Connection::BackwardUpdate() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("process",5,
+		     "===> Connection::BackwardUpdate() ["
+		     <<GetFullName()<<"]"<<std::endl);
 
     IOStatus s = UPTODATE;
-    s = mFrom->bbBackwardUpdate(this);
+    s = mFrom->bbBackwardUpdate(GetThisPointer<Connection>());
 
     TransferData();
 
     if (mAdaptor && (s==MODIFIED)) mAdaptor->bbSetModifiedStatus();
 
-    bbtkDebugDecTab("Process",2);
-
+    bbtkDebugMessage("process",5,
+		     "<=== Connection::BackwardUpdate() ["
+		     <<GetFullName()<<"]"<<std::endl);
     return s;
   }
   //==================================================================
@@ -163,7 +341,7 @@ namespace bbtk
   /// Forward Update
   void Connection::ForwardUpdate()
   {
-    bbtkDebugMessageInc("Process",2,
+    bbtkDebugMessageInc("process",2,
 			"Connection::ForwardUpdate() ["
 			<<GetFullName()<<"]"<<std::endl);
 
@@ -172,7 +350,7 @@ namespace bbtk
 
     mTo->bbForwardUpdate(this);
 
-    bbtkDebugDecTab("Process",2);
+    bbtkDebugDecTab("process",2);
   }
   //==================================================================
   */
@@ -182,7 +360,7 @@ namespace bbtk
   /// doing necessary conversions (adaptation or pointer cast)
   void Connection::TransferData()
   {
-    bbtkDebugMessageInc("Process",3,
+    bbtkDebugMessageInc("data",3,
 			"Connection::TransferData() ["
 			<<GetFullName()<<"]"<<std::endl);
     
@@ -199,16 +377,13 @@ namespace bbtk
     // If no adaptor but source type is an any and target is not an any
     else if ( mFromAny && (! mToAny) )
       {
-	bbtkDebugMessage("Data",3,
-			 "Connection::TransferData() ["
-			 <<GetFullName()<<"]"<<std::endl);
-	bbtkDebugMessage("Data",3,
+	bbtkDebugMessage("data",3,
 			 " * Source type is an "
 			 <<HumanTypeName<Data>()
 			 <<" which contains a <"
 			 <<HumanTypeName(mFrom->bbGetOutput(mOutput).type())
 			 <<">"<<std::endl);
-	bbtkDebugMessage("Data",3,
+	bbtkDebugMessage("data",3,
 			 " * Target type is <"
 			 <<HumanTypeName(mTo->bbGetInputType(mInput))
 			 <<">"<<std::endl);
@@ -217,7 +392,7 @@ namespace bbtk
 	if (mFrom->bbGetOutput(mOutput)
 	    .contains( mTo->bbGetInputType(mInput) ) )
 	  {
-	    bbtkDebugMessage("Data",3,
+	    bbtkDebugMessage("data",3,
 			     " -> Equal types : transfer ok"<<std::endl);
 	    mTo->bbSetInput( mInput, 
 			     mFrom->bbGetOutput(mOutput),
@@ -226,25 +401,26 @@ namespace bbtk
 	else 
 	  {
 	    // 2) Look for an adaptor
-	    bbtk::BlackBox* adaptor = 0;
+	    bbtk::BlackBox::Pointer adaptor;
 	    try 
 	      {
-		adaptor = NewAdaptor(mFrom->bbGetOutput(mOutput).type(),
-				     mTo->bbGetInputType(mInput),
-				     "");
+		adaptor = mFactory.lock()
+		  ->NewAdaptor(mFrom->bbGetOutput(mOutput).type(),
+			       mTo->bbGetInputType(mInput),
+			       "");
 	      }
 	    catch (...)
 	      {
 	      }
 	    if (adaptor)  
 	      {
-		bbtkDebugMessage("Data",3," -> Adaptor found : using it"
+		bbtkDebugMessage("data",3," -> Adaptor found : using it"
 				 <<std::endl);
 		  adaptor->bbSetInput("In",mFrom->bbGetOutput(mOutput),false);
 		adaptor->bbExecute();
 		// LG : Connection Update does not set mTo as modified
 		mTo->bbSetInput(mInput, adaptor->bbGetOutput("Out"),false);
-		adaptor->bbDelete();
+		//	adaptor->bbDelete();
 	      }
 	    // 3) If no adaptor found but the any content is a pointer
 	    //    and target type is also a pointer : we try run-time cast
@@ -252,7 +428,7 @@ namespace bbtk
 		      (mTo->bbGetDescriptor()->GetInputDescriptor(mInput)
 		       ->IsPointerType()) )
 	      {
-		bbtkDebugMessage("Data",3,
+		bbtkDebugMessage("data",3,
 				 " -> No adaptor found but source and target types are both pointers : trying up or down cast"<<std::endl);
 		
 		void* nptr = 
@@ -289,7 +465,6 @@ namespace bbtk
 	mTo->bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false);
       }
 
-    bbtkDebugDecTab("Process",3);
   }
   //==================================================================
   
@@ -297,29 +472,191 @@ namespace bbtk
   /// Modified
   void Connection::SetModifiedStatus()
   {
-    bbtkDebugMessageInc("Process",5,
-			"Connection::SetModifiedStatus() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("modified",2,
+		     "==> Connection::SetModifiedStatus() ["
+		     <<GetFullName()<<"]"<<std::endl);
     
     if (mAdaptor) mAdaptor->bbSetModifiedStatus();
     
     mTo->bbSetModifiedStatus(  mTo->bbGetInputConnectorMap().find(mInput)->second );
     
-    bbtkDebugDecTab("Process",5);
+    /*
+    bbtkDebugMessage("modified",2,
+		     "==> Connection::SetModifiedStatus() ["
+		     <<GetFullName()<<"]"<<std::endl);
+    */
   }
   //==================================================================
 
   
   //==================================================================
   std::string Connection::GetFullName() const {
-    if (mFrom && mTo)
-      return  mFrom->bbGetName()+"."+mOutput+"--"
-	+mTo->bbGetName()+"."+mInput;
+    if (mFrom && mTo) 
+      {
+	std::string res = mFrom->bbGetName()+"."+mOutput+"--"
+	  +mTo->bbGetName()+"."+mInput;
+	if ((!mOriginalFrom.expired()) && (!mOriginalTo.expired()) &&
+	    ((mFrom!=mOriginalFrom.lock())||(mTo!=mOriginalTo.lock())))
+	  {
+	    res += "("+mOriginalFrom.lock()->bbGetName()
+	      +"."+mOriginalOutput+"--"
+	      + mOriginalTo.lock()->bbGetName()+"."+mOriginalInput+")";
+	  }
+	return res;
+      }
     return "***Invalid Connection***";
   }
   //==================================================================
 
+  //==================================================================
+  void Connection::Check() const
+  {
+    bbtkMessage("debug",1,"** Checking Connection "<<(void*)this<<" ["<<GetFullName()<<"]"
+		<<std::endl);
+    if (mFrom==0) 
+      {
+	bbtkMessage("debug",2," - From = 0"<<std::endl);
+      }
+    else
+      {
+	bbtkMessage("debug",2," - From : "<<mFrom->bbGetFullName()<<std::endl);
+	if (!mFrom->bbHasOutput(mOutput))
+	  {
+	    bbtkError("** Checking Connection "<<(void*)this
+		       <<" ["<<GetFullName()<<"] : "
+		      << mFrom->bbGetFullName()<<" does not have output '"
+		      <<mOutput<<"'");
+	  }	
+	bbtkMessage("debug",2," - From : Output '"<<mOutput<<"' exists"<<std::endl);
+	BlackBox::OutputConnectorMapType::const_iterator i 
+	  = mFrom->bbGetOutputConnectorMap().find(mOutput);
+	if (i== mFrom->bbGetOutputConnectorMap().end())
+	  {
+	     bbtkError("** Checking Connection "<<(void*)this
+		       <<" ["<<GetFullName()<<"] : "
+		       <<mFrom->bbGetFullName()<<" output '"
+		       <<mOutput<<"' is not in OutputConnectorMap");
+	  }
+	bbtkMessage("debug",2," - From : Output '"<<mOutput
+		    <<"' is in OutputConnectorMap"<<std::endl);
+
+        std::vector< Connection* >::const_iterator j;
+	/*
+	for (j  = i->second->GetConnectionVector().begin();
+	     j != i->second->GetConnectionVector().end();
+	     ++j)
+	  {
+	    if ((*j)==this) break;
+	  }
+	*/
+	j = find(i->second->GetConnectionVector().begin(),
+		 i->second->GetConnectionVector().end(),
+		 this);
+       
+	if (j==i->second->GetConnectionVector().end())
+	  {
+	    bbtkError("** Checking Connection "<<(void*)this
+		      <<" ["<<GetFullName()<<"] : "
+		      << "Connection ["<<GetFullName()<<"] : "
+		      <<" OutputConnector '"
+		      <<mOutput<<"' of "<<mFrom->bbGetFullName()
+		      <<" does not point to this connection");
+	    
+	  }
+	bbtkMessage("debug",2," - From : This connection is in OutputConnector connection vector"<<std::endl);
+	bbtkMessage("debug",2," * Box from : Check successfull"<<std::endl);
+
+      }
 
+    if (mTo==0) 
+      {
+	bbtkMessage("debug",2," - To   = 0"<<std::endl);
+      }
+    else
+      {
+	bbtkMessage("debug",2," - To   : "<<mTo->bbGetName()<<std::endl);
+	//	std::cout << mTo << std::endl;
+	//	std::cout << mTo->bbGetDescriptor() << std::endl;
+	//	std::cout << mTo->bbGetDescriptor()->GetTypeName() << std::endl;
+	//	mTo->bbGetFullName();
+	bbtkMessage("debug",2," - To   : "<<mTo->bbGetFullName()<<std::endl);
+	if (!mTo->bbHasInput(mInput))
+	  {
+	    bbtkError("** Checking Connection "<<(void*)this
+		      <<" ["<<GetFullName()<<"] : "
+		      <<mTo->bbGetFullName()<<" does not have input '"
+		      <<mInput<<"'");
+	  }	
+	bbtkMessage("debug",2," - To   : Input '"<<mInput<<"' exists"<<std::endl);
+	BlackBox::InputConnectorMapType::const_iterator i 
+	  = mTo->bbGetInputConnectorMap().find(mInput);
+	if (i== mTo->bbGetInputConnectorMap().end())
+	  {
+	     bbtkError("** Checking Connection "<<(void*)this
+		       <<" ["<<GetFullName()<<"] : "
+		       <<mTo->bbGetFullName()<<" input '"
+		       <<mInput<<"' is not in InputConnectorMap");
+	  }
+	bbtkMessage("debug",2," - To   : Input '"<<mInput
+		    <<"' is in InputConnectorMap"<<std::endl);
+
+	if (i->second->GetConnection()==0)
+	  {
+	    bbtkError("** Checking Connection "<<(void*)this
+		      <<" ["<<GetFullName()<<"] : "
+		      <<"Connection "<<GetFullName()<<" : "
+		      <<" InputConnector '"
+		      <<mInput<<"' of "<<mTo->bbGetFullName()
+		      <<" does not point to this connection");
+    
+	  }
+	bbtkMessage("debug",2," - To   : This connection is in InputConnector connection vector"<<std::endl);
+	bbtkMessage("debug",2," * Box to   : Check successfull"<<std::endl);
+
+      }
+  }
+  //==================================================================
+ //==========================================================================
+  std::string Connection::GetObjectName() const
+  {
+    std::string s("Connection '");
+    s += GetFullName();
+    s += "'";
+    return s;
+  }
+  //==========================================================================
+  
+  //==========================================================================
+  std::string  Connection::GetObjectInfo() const 
+  {
+    std::stringstream i;
+    return i.str();
+  }
+  //==========================================================================
+
+ //==========================================================================
+size_t  Connection::GetObjectSize() const 
+{
+  size_t s = Superclass::GetObjectSize();
+  s += Connection::GetObjectInternalSize();
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+size_t  Connection::GetObjectInternalSize() const 
+{
+  size_t s = sizeof(Connection);
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  Connection::GetObjectRecursiveSize() const 
+  {
+    size_t s = Superclass::GetObjectRecursiveSize();
+    s += Connection::GetObjectInternalSize();
+    return s;
+  }
+  //==========================================================================
 
 }// namespace bbtk