Always vs BlackBox::Always

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index c35e82c78a5bb50c0eb4df6267a87b5cdd9eb518..5e12c265b120b89a7d918e9d81d17d8d0f4e7568 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/21 16:03:17 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2011/03/01 14:50:28 $
+  Version:   $Revision: 1.50 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -48,8 +48,6 @@
 
 namespace bbtk
 {
-
-
   static bool bbmgSomeBoxExecuting = false;
   static bool bbmgFreezeExecution = false;
   static std::set<BlackBox::WeakPointer> bbmgExecutionList;
@@ -281,7 +279,6 @@ namespace bbtk
        bbGetOutputConnectorMap()[o->second->GetName()] 
          = new BlackBoxOutputConnector(GetThisPointer<BlackBox>());
       }
-
   }
   //=========================================================================
 
@@ -308,8 +305,7 @@ namespace bbtk
        delete (o->second);
       }                                                                        
    
-    bbtkDebugDecTab("kernel",8);  
-
+    bbtkDebugDecTab("kernel",8);
   }
   //=========================================================================
 
@@ -345,7 +341,6 @@ namespace bbtk
       }
 
     bbtkDebugDecTab("kernel",9);
-
   }
   //=========================================================================
 
@@ -358,7 +353,7 @@ namespace bbtk
 #ifdef USE_WXWIDGETS
             || Wx::IsSomeWindowAlive() 
 #endif
-            ); 
+            );
   }
   //=========================================================================
 
@@ -370,14 +365,14 @@ namespace bbtk
     const std::string& p = bbmBoxProcessMode;
     if ( (p == "0") ||
         (p == "P") || (p == "p") ||
-        (p == "Pipeline") || (p == "pipeline") ) return Pipeline;
+        (p == "Pipeline") || (p == "pipeline") ) return BlackBox::Pipeline;
     if ( (p == "1") ||
         (p == "A") || (p == "a") ||
-        (p == "Always") || (p == "always") ) return Always;
+        (p == "Always") || (p == "always") ) return BlackBox::Always;
     if ( (p == "2") ||
         (p == "R") || (p == "r") ||
         (p == "Reactive") || (p == "reactive") ) 
-               return Reactive;
+               return BlackBox::Reactive;
     /*
     if ( (p == "3") ||
         (p == "F") || (p == "f") ||
@@ -396,14 +391,14 @@ namespace bbtk
   //=========================================================================
   bool  BlackBox::bbBoxProcessModeIsReactive() const
   {
-    return (bbGetBoxProcessModeValue() == Reactive);
+    return (bbGetBoxProcessModeValue() == BlackBox::Reactive);
   }
   //=========================================================================
 
   //=========================================================================
   bool  BlackBox::bbBoxProcessModeIsAlways() const
   {
-    return (bbGetBoxProcessModeValue() == Always);
+    return (bbGetBoxProcessModeValue() == BlackBox::Always);
   }
   //=========================================================================
 
@@ -480,7 +475,7 @@ namespace bbtk
                             "=> BlackBox::bbSignalOutputModification("
                             <<reaction<<")"
                             <<"]"<<std::endl);
-    
+
     OutputConnectorMapType::iterator i;
     for ( i  = bbGetOutputConnectorMap().begin(); 
          i != bbGetOutputConnectorMap().end(); ++i) 
@@ -501,7 +496,6 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification()"
                             <<std::endl);
-    
   }  
   //=========================================================================   
   //=========================================================================  
@@ -541,7 +535,6 @@ namespace bbtk
                             "<= BlackBox::bbSignalOutputModification("
                             <<output<<")"
                             <<std::endl);
-    
   }  
   //=========================================================================   
   //=========================================================================  
@@ -585,7 +578,6 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification(vector of outputs)"
                             <<std::endl);
-
   }  
   //=========================================================================   
 
@@ -733,8 +725,7 @@ namespace bbtk
     bbSetExecuting(false);
     bbGlobalSetSomeBoxExecuting(wasExecuting);
 
-    return; 
-
+    return;
   }
   //=========================================================================
   
@@ -777,9 +768,7 @@ namespace bbtk
     
     bbtkBlackBoxDebugMessage("process",4,
                        "<= BlackBox::bbUpdateInputs()"
-                       <<std::endl);   
-    
-    
+                       <<std::endl);
     return s;
   }
   //=========================================================================
@@ -823,8 +812,7 @@ namespace bbtk
 
     bbtkBlackBoxDebugMessage("process",4,
                        "<= BlackBox::bbComputePostProcessStatus()"
-                       <<std::endl);   
-
+                       <<std::endl);
   }
   //==================================================================
 
@@ -836,7 +824,6 @@ namespace bbtk
                        <<name<<"\","<<c->GetFullName()<<")"
                        <<std::endl);       
 
-
     InputConnectorMapType::iterator i = bbGetInputConnectorMap().find(name);
     if (i==bbGetInputConnectorMap().end())
       {
@@ -845,12 +832,11 @@ namespace bbtk
     i->second->SetConnection(c);
     // The input *MUST* be set OUTOFDATE to update its input on next execution
     bbSetStatusAndPropagate(i->second,OUTOFDATE);
-    
+
     bbtkBlackBoxDebugMessage("connection",2,
                        "<== BlackBox::bbConnectInput(\""
                        <<name<<"\","<<c->GetFullName()<<")"
-                       <<std::endl);       
-
+                       <<std::endl);
   }
   //=========================================================================
 
@@ -862,7 +848,7 @@ namespace bbtk
                             "==> BlackBox::bbConnectOutput(\""<<name<<"\","
                             <<c->GetFullName()<<")"
                             <<std::endl);       
-    
+
     OutputConnectorMapType::iterator i = bbGetOutputConnectorMap().find(name);
     if (i==bbGetOutputConnectorMap().end())
       {
@@ -873,8 +859,7 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("connection",2,
                             "<== BlackBox::bbConnectOutput(\""<<name<<"\","
                             <<c->GetFullName()<<")"
-                            <<std::endl);       
-
+                            <<std::endl);
   }
   //=========================================================================
 
@@ -886,8 +871,7 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("connection",2,
                     "==> BlackBox::bbDisconnectInput(\""<<name
                     <<"\","<<c->GetFullName()<<")"
-                    <<std::endl);      
-
+                    <<std::endl);
     if (!c) 
       {
 

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index ab689bd6ab9d6c81377c2b4f71f4e951f9e382a5..9b1775e84522344d1b239d77bbc0fa6e11c4a4ca 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2009/10/13 17:39:21 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2011/03/01 14:50:28 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -63,15 +63,12 @@
 namespace bbtk
 {
 
-
   struct Void { Void(int = 0) {} };
 
   class Factory;
   class Connection;
   class BlackBoxOutputConnector;
 
-
-
   class BBTK_EXPORT BlackBox : public Object
   {
     BBTK_ABSTRACT_OBJECT_INTERFACE(BlackBox);
@@ -296,13 +293,15 @@ namespace bbtk
     /// Sets the value of the input 'BoxProcessMode'
     void bbSetInputBoxProcessMode(std::string a) { bbmBoxProcessMode = a; }
     /// The possible values of the input 'BoxProcessMode'
-    typedef enum
-      {
-       Pipeline,
-       Always,
-       Reactive
-      }
+ 
+    typedef enum 
+     {
+      Pipeline,
+      Always,
+      Reactive
+     }
     BoxProcessModeValue;
+    
     /// Returns the "decoded" value of the input "BoxProcessMode"
     BoxProcessModeValue bbGetBoxProcessModeValue() const;
     /// Returns true iff the input 'BoxProcessMode' is set to 'Reactive' (or a synonym)
@@ -322,9 +321,6 @@ namespace bbtk
     //@}
     //==================================================================
 
-
-
-
     virtual void bbPrintHelp(BlackBox::Pointer parentblackbox,
                             int detail, int level
                             );
@@ -365,14 +361,11 @@ namespace bbtk
 
   protected:
 
-
-
    //==================================================================
     /// @name User redefinable methods
     ///  Virtual methods which can be redefined by inherited classes
     //@{
 
-
     //==================================================================
     /// User can redefine this method to set
     /// the default values of the box inputs and outputs
@@ -401,8 +394,6 @@ namespace bbtk
     //==================================================================
 
 
-
-
     //==================================================================
 
     /// Write Graphviz-dot description in file.
@@ -423,16 +414,11 @@ namespace bbtk
                                           bool inputoutput,
                                           int detail, int level);
 
-
-
      virtual BlackBox::Pointer bbFindBlackBox(const std::string &blackboxname)
-    { return BlackBox::Pointer();}
+              { return BlackBox::Pointer();}
 
     virtual void Check(bool recursive = true);
 
-
-
-
     //==================================================================
     // PROTECTED PART : ACCESSIBLE TO THE BlackBox DEVELOPER
     // (IN INHERITED CLASSES)
@@ -558,8 +544,6 @@ namespace bbtk
     //@}
     //==================================================================
 
-
-
   private:
     //==================================================================
     friend class Connection;
@@ -593,17 +577,11 @@ namespace bbtk
     /// which means execute in response to an input change
     virtual bool bbCanReact() const;
 
-
-
-
-
     /// Returns true iff the box is executing
     bool bbGetExecuting() const { return bbmExecuting; }
     /// Sets the bbmExecuting bool returned by bbGetExecuting
     void bbSetExecuting(bool b) { bbmExecuting = b; }
 
-
-
   protected:
 
     //==================================================================
@@ -642,7 +620,7 @@ namespace bbtk
 
 //JCP 21-09-20 09 delete this throws and exception change due to compiler version changing and boost version
     virtual int bbDelete() { delete this; 
-                                                       return 0; }
+                             return 0; }
     //==================================================================
 
 
@@ -677,22 +655,14 @@ namespace bbtk
     ///  Map that contains the input connectors of the black box
     InputConnectorMapType mInputConnectorMap;
     //==================================================================
-
-
  };
   // Class BlackBox
 
 
-
   /// Convenient macro to create output observer callbacks (freehand functions) from object and method pointer (see samples/SampleOutputObserver)
 #define BBTK_MAKE_OUTPUT_OBSERVER(OBJECT,METHOD) \
     boost::bind( METHOD, OBJECT, _1, _2, _3)
 
-
-
-
-
 }
 // namespace bbtk
 #endif
-