From dfa8415862bbca27ee13a0099d255450a546ac7d Mon Sep 17 00:00:00 2001
From: Christophe Alexandre <alliance-users@asim.lip6.fr>
Date: Fri, 4 Jan 2008 16:07:49 +0000
Subject: [PATCH] new method convention in progress

---
 hurricane/src/analogic/GenTrans.h     | 18 +++---
 hurricane/src/analogic/GenV1Trans.cpp | 80 +++++++++++++--------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/hurricane/src/analogic/GenTrans.h b/hurricane/src/analogic/GenTrans.h
index fa56ae80..7c4d8fa8 100644
--- a/hurricane/src/analogic/GenTrans.h
+++ b/hurricane/src/analogic/GenTrans.h
@@ -117,14 +117,14 @@
 
 #  define CREATE_CONTACT_MATRIX_UNDER(underbox, nbcolumn, layer, net) \
                                                                       \
-        if(underbox.GetHeight()<rw_cont)   \
+        if(underbox.getHeight()<rw_cont)   \
            nbcontact = 0; \
         else \
-           nbcontact = (underbox.GetHeight()-rw_cont)/(rw_cont + rd_cont) + 1 ;\
+           nbcontact = (underbox.getHeight()-rw_cont)/(rw_cont + rd_cont) + 1 ;\
          \
                                                                      \
-        tmp_xcenter = underbox.GetXMin() + (rw_cont/2);  \
-        tmp_ycenter = underbox.GetYMin() + (rw_cont/2);  \
+        tmp_xcenter = underbox.getXMin() + (rw_cont/2);  \
+        tmp_ycenter = underbox.getYMin() + (rw_cont/2);  \
                                                                   \
 \
         for(unsigned i=0; i<nbcolumn; i++) { \
@@ -141,7 +141,7 @@
            }              \
               \
            tmp_xcenter += (rw_cont + rd_cont);  \
-           tmp_ycenter = underbox.GetYMin() + (rw_cont/2); \
+           tmp_ycenter = underbox.getYMin() + (rw_cont/2); \
 	}
 
 // ------------------------------------------------------------------
@@ -155,10 +155,10 @@
     */
  
 #  define BOX_IS_VALID(box) \
-   ( (long)(GetValue(box.GetXMin()))%2==0 )&& \
-   ( (long)(GetValue(box.GetXMax()))%2==0 )&& \
-   ( (long)(GetValue(box.GetYMin()))%2==0 )&& \
-   ( (long)(GetValue(box.GetYMax()))%2==0 ) 
+   ( (long)(GetValue(box.getXMin()))%2==0 )&& \
+   ( (long)(GetValue(box.getXMax()))%2==0 )&& \
+   ( (long)(GetValue(box.getYMin()))%2==0 )&& \
+   ( (long)(GetValue(box.getYMax()))%2==0 ) 
    
 
 BEGIN_NAMESPACE_HURRICANE
diff --git a/hurricane/src/analogic/GenV1Trans.cpp b/hurricane/src/analogic/GenV1Trans.cpp
index 5db3f615..528ba67c 100644
--- a/hurricane/src/analogic/GenV1Trans.cpp
+++ b/hurricane/src/analogic/GenV1Trans.cpp
@@ -299,7 +299,7 @@ void GenV1Trans::Calculate(Transistor* transistor)
     j = _mapString2Box.end();
 
   while(i!=j) {
-    _mapString2Box[(*i).first] = (*i).second.Translate(-xmin, -ymin);      
+    _mapString2Box[(*i).first] = (*i).second.translate(-xmin, -ymin);      
 
     IF_DEBUG_HUR_ANALOG
       cout << ts << (*i).first <<"  " << GetString((*i).second) << endl;
@@ -367,10 +367,10 @@ END_IF
     }
     else {     
       Contact::Create(source, GET_LAYER_BYNP("TRANS_",mostype,"_LAYER_"+segsforsource[i])
-                    , GET_BOX(segsforsource[i]).GetXCenter()
-                    , GET_BOX(segsforsource[i]).GetYCenter()
-  		    , GET_BOX(segsforsource[i]).GetWidth()
-  		    , GET_BOX(segsforsource[i]).GetHeight() 
+                    , GET_BOX(segsforsource[i]).getXCenter()
+                    , GET_BOX(segsforsource[i]).getYCenter()
+  		    , GET_BOX(segsforsource[i]).getWidth()
+  		    , GET_BOX(segsforsource[i]).getHeight() 
   		    );
     }
   }  
@@ -387,16 +387,16 @@ IF_DEBUG_HUR_ANALOG
 END_IF
   for(size_t i=0; i<sizeof(segsforgrid)/sizeof(string); i++) {
        if(segsforgrid[i]=="30"){
-          if( GET_BOX(segsforgrid[i]).GetWidth()==GET_RULE("RW_CONT") ) {
+          if( GET_BOX(segsforgrid[i]).getWidth()==GET_RULE("RW_CONT") ) {
               Contact::Create(grid, GET_LAYER_BYNP("TRANS_",mostype,"_LAYER_"+segsforgrid[i])
-                              , GET_BOX(segsforgrid[i]).GetXCenter()
-                              , GET_BOX(segsforgrid[i]).GetYCenter()
-            		      , GET_BOX(segsforgrid[i]).GetWidth()
-            		      , GET_BOX(segsforgrid[i]).GetHeight()
+                              , GET_BOX(segsforgrid[i]).getXCenter()
+                              , GET_BOX(segsforgrid[i]).getYCenter()
+            		      , GET_BOX(segsforgrid[i]).getWidth()
+            		      , GET_BOX(segsforgrid[i]).getHeight()
                              );
 	  }    
 	  else  {
-              unsigned int nbcolumn = (GET_BOX(segsforgrid[i]).GetWidth()-rw_cont)/(rw_cont + rd_cont) + 1;
+              unsigned int nbcolumn = (GET_BOX(segsforgrid[i]).getWidth()-rw_cont)/(rw_cont + rd_cont) + 1;
  
 IF_DEBUG_HUR_ANALOG
 	      cout << ts << "nbcolumn in rectangle 30 is " << nbcolumn <<endl;
@@ -407,12 +407,12 @@ END_IF
 	  }
        }
        else {
-	  if(GET_BOX(segsforgrid[i]).GetXMin() < GET_BOX(segsforgrid[i]).GetXMax()) {
+	  if(GET_BOX(segsforgrid[i]).getXMin() < GET_BOX(segsforgrid[i]).getXMax()) {
               Contact::Create(grid, GET_LAYER_BYNP("TRANS_",mostype,"_LAYER_"+segsforgrid[i])
-                              , GET_BOX(segsforgrid[i]).GetXCenter()
-                              , GET_BOX(segsforgrid[i]).GetYCenter()
-            		      , GET_BOX(segsforgrid[i]).GetWidth()
-            		      , GET_BOX(segsforgrid[i]).GetHeight()
+                              , GET_BOX(segsforgrid[i]).getXCenter()
+                              , GET_BOX(segsforgrid[i]).getYCenter()
+            		      , GET_BOX(segsforgrid[i]).getWidth()
+            		      , GET_BOX(segsforgrid[i]).getHeight()
                              );
           }
        }
@@ -439,10 +439,10 @@ END_IF
     }
     else {     
       Contact::Create(drain, GET_LAYER_BYNP("TRANS_",mostype,"_LAYER_"+segsfordrain[i])
-                    , GET_BOX(segsfordrain[i]).GetXCenter()
-                    , GET_BOX(segsfordrain[i]).GetYCenter()
-  		    , GET_BOX(segsfordrain[i]).GetWidth()
-  		    , GET_BOX(segsfordrain[i]).GetHeight() 
+                    , GET_BOX(segsfordrain[i]).getXCenter()
+                    , GET_BOX(segsfordrain[i]).getYCenter()
+  		    , GET_BOX(segsfordrain[i]).getWidth()
+  		    , GET_BOX(segsfordrain[i]).getHeight() 
   		    );
     }
   }  
@@ -462,10 +462,10 @@ END_IF
       continue;
 
     Contact::Create(anonym, GET_LAYER_BYNP("TRANS_",mostype,"_LAYER_"+segsforanonym[i])
-	           , GET_BOX(segsforanonym[i]).GetXCenter()
-		   , GET_BOX(segsforanonym[i]).GetYCenter()
-		   , GET_BOX(segsforanonym[i]).GetWidth()
-		   , GET_BOX(segsforanonym[i]).GetHeight()
+	           , GET_BOX(segsforanonym[i]).getXCenter()
+		   , GET_BOX(segsforanonym[i]).getYCenter()
+		   , GET_BOX(segsforanonym[i]).getWidth()
+		   , GET_BOX(segsforanonym[i]).getHeight()
 		   );
   }
 
@@ -493,37 +493,37 @@ END_IF
   switch(transistor->GetAbutmentType().GetCode()) {
 
     case Transistor::Type::INTERNAL : 
-        transistor->SetAbutmentBox( Box(GET_BOX(string("20")).GetXCenter() 
-       	                             , transistor->GetBoundingBox().GetYMin()
-       	   			     , GET_BOX(string("40")).GetXCenter()
-       	   			     , transistor->GetBoundingBox().GetYMax()
+        transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter() 
+       	                             , transistor->GetBoundingBox().getYMin()
+       	   			     , GET_BOX(string("40")).getXCenter()
+       	   			     , transistor->GetBoundingBox().getYMax()
 				    )
        	   			  );  
 	break; 
 
     case Transistor::Type::LEFT: 
-        transistor->SetAbutmentBox( Box(GET_BOX(string("11")).GetXMin() 
-       	                              , transistor->GetBoundingBox().GetYMin()
-       	   			      , GET_BOX(string("40")).GetXCenter()
-       	   			      , transistor->GetBoundingBox().GetYMax()
+        transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin() 
+       	                              , transistor->GetBoundingBox().getYMin()
+       	   			      , GET_BOX(string("40")).getXCenter()
+       	   			      , transistor->GetBoundingBox().getYMax()
 				    )
        	   			  );  
 	break ;
      
     case Transistor::Type::RIGHT: 
-        transistor->SetAbutmentBox( Box(GET_BOX(string("20")).GetXCenter() 
-       	                              , transistor->GetBoundingBox().GetYMin()
-       	   			      , GET_BOX(string("11")).GetXMax()
-       	   			      , transistor->GetBoundingBox().GetYMax()
+        transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter() 
+       	                              , transistor->GetBoundingBox().getYMin()
+       	   			      , GET_BOX(string("11")).getXMax()
+       	   			      , transistor->GetBoundingBox().getYMax()
 				    )
        	   			  );  
 	break ;
 
     case Transistor::Type::SINGLE: 
-        transistor->SetAbutmentBox( Box(GET_BOX(string("11")).GetXMin() 
-       	                              , transistor->GetBoundingBox().GetYMin()
-       	   			      , GET_BOX(string("11")).GetXMax()
-       	   			      , transistor->GetBoundingBox().GetYMax()
+        transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin() 
+       	                              , transistor->GetBoundingBox().getYMin()
+       	   			      , GET_BOX(string("11")).getXMax()
+       	   			      , transistor->GetBoundingBox().getYMax()
                                     )
        	   			  );  
 	break ;