Merge branch 'devel_anabatic' of ssh://bop-t/users/largo2/git/coriolis into devel_anabatic

Conflicts:
	anabatic/src/Dijkstra.cpp

anabatic/src/LoadGlobalRouting.cpp

@@ -2929,7 +2929,7 @@ namespace {
             forks.push( getSegmentOppositeHook( _south ), source );
             targetContact = target;
           } else {
-            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut."
+            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut 1."
                            , getString(_gcell).c_str() )
                  << endl;
           }
@@ -2940,7 +2940,7 @@ namespace {
           } else if ( _south and (_fromHook != _south) ){
             forks.push( getSegmentOppositeHook( _south ), target );
           } else {
-            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut."
+            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut 2."
                            , getString(_gcell).c_str() )
                  << endl;
           }
@@ -2979,7 +2979,7 @@ namespace {
             forks.push( getSegmentOppositeHook( _west ), source );
             targetContact = target;
           } else {
-            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut."
+            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut. 3"
                            , getString(_gcell).c_str() )
                  << endl;
           }
@@ -2991,7 +2991,7 @@ namespace {
           } else if ( _west and (_fromHook != _west) ){
             forks.push( getSegmentOppositeHook( _west ), target );
           } else {
-            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut."
+            cerr << Warning( "Something is wrong with the globals and the fromHook in this Strut. 4"
                            , getString(_gcell).c_str() )
                  << endl;
           }
@@ -3011,7 +3011,7 @@ namespace {
         cdebug_log(145,0) << "[Create global segment]: " << globalSegment << endl;
 
       } else {
-        cerr << Warning( "Something is wrong with the globals in this Strut."
+        cerr << Warning( "Something is wrong with the globals in this Strut. 5 "
                        , getString(_gcell).c_str() )
              << endl;
       }
@@ -3175,7 +3175,7 @@ namespace {
         cdebug_log(145,0) << "[Create global segment]: " << globalSegment << endl;
 
       } else {
-        cerr << Warning( "Something is wrong with the globals in this Strut."
+        cerr << Warning( "Something is wrong with the globals in this Strut. 6"
                        , getString(_gcell).c_str() )
              << endl;
       }
@@ -3368,7 +3368,7 @@ namespace {
         cdebug_log(145,0) << "[Create global segment]: " << globalSegment2 << endl;
       }
     } else { 
-      cerr << Warning( "Something is wrong with the number of globals in this Strut."
+      cerr << Warning( "Something is wrong with the number of globals in this Strut. 7"
                      , getString(_gcell).c_str() )
            << endl;
     }

anabatic/src/anabatic/Dijkstra.h

@@ -38,6 +38,43 @@ namespace Anabatic {
   class AnabaticEngine;
 
 
+// -------------------------------------------------------------------
+// Class  :  "Anabatic::Symmetry".
+
+  class Symmetry
+  {
+    public:
+      enum iFlag { None        = 0
+                 , sHorizontal = (1<<0)
+                 , sVertical   = (1<<1)
+                 , sCFound     = (1<<2)
+      };
+    private:
+       Symmetry(unsigned int, DbU::Unit);
+      ~Symmetry();
+    public:
+      static Symmetry* create(unsigned int, DbU::Unit);   
+
+    public:
+             unsigned int getType () const;
+      inline DbU::Unit    getValue() const;
+      inline bool         isCFound() const;
+      inline void         setAsH();
+      inline void         setAsV();
+      inline void         setFound();
+
+    private:
+      unsigned int _flags;
+      DbU::Unit    _value;
+  };
+
+  inline void      Symmetry::setAsH   () { _flags = ((_flags & ~(0x3)) | sHorizontal); }
+  inline void      Symmetry::setAsV   () { _flags = ((_flags & ~(0x3)) | sVertical  ); }
+  inline void      Symmetry::setFound () { _flags |= sCFound; }
+  inline DbU::Unit Symmetry::getValue () const { return _value; }
+  inline bool      Symmetry::isCFound () const { return _flags & sCFound; }
+  
+
 // -------------------------------------------------------------------
 // Class  :  "Anabatic::IntervalC".
 
@@ -106,8 +143,9 @@ namespace Anabatic {
           enum FlagR { NoRestriction = 0
                      , NRestricted   = (1<<0)
                      , SRestricted   = (1<<1)
-                     , ERestricted   = (1<<2)
+                     , ERestricted   = (1<<2)  
                      , WRestricted   = (1<<3)
+                     , AxisTarget    = (1<<4)
                      };
     public:
       static         DbU::Unit       unreached;
@@ -195,6 +233,10 @@ namespace Anabatic {
               inline void            printInterval     () const ;
                      void            setIntervals      ( Vertex* );
                      void            resetIntervals    ();
+             inline  void            setFlags          ( unsigned int );
+             inline  bool            isAxisTarget      () const;
+             inline  void            unsetFlags        ( unsigned int );
+             inline  void            setAxisTarget     ();
  
 
     // Inspector support. 
@@ -286,10 +328,10 @@ namespace Anabatic {
 
   inline void         Vertex::setRestricted    () { _flags |= 0xF; }
   inline void         Vertex::clearRestriction () { _flags &= ~(0xF); }
-  inline void         Vertex::setNRestricted   () { _flags |= 0x1; }
+  inline void         Vertex::setNRestricted   () { _flags |= NRestricted; }
-  inline void         Vertex::setSRestricted   () { _flags |= 0x2; }
+  inline void         Vertex::setSRestricted   () { _flags |= SRestricted; }
-  inline void         Vertex::setERestricted   () { _flags |= 0x4; }
+  inline void         Vertex::setERestricted   () { _flags |= ERestricted; }
-  inline void         Vertex::setWRestricted   () { _flags |= 0x8; }
+  inline void         Vertex::setWRestricted   () { _flags |= WRestricted; }
   inline unsigned int Vertex::getFlags         () const { return _flags; }
 
   inline void         Vertex::setIAxis   ( DbU::Unit axis ) { _interv->setAxis(axis); }
@@ -313,6 +355,9 @@ namespace Anabatic {
   inline void         Vertex::setIRangeFrom( DbU::Unit min, DbU::Unit max ) { _intervfrom->setRange(min, max); }
   inline void         Vertex::printInterval() const { _interv->print(); } 
 
+  inline void         Vertex::setAxisTarget() { _flags |= AxisTarget; }
+  inline bool         Vertex::isAxisTarget () const { return (_flags & AxisTarget); }
+  inline void         Vertex::unsetFlags   ( unsigned int mask ) { _flags &= ~mask; }
 // -------------------------------------------------------------------
 // Class  :  "Anabatic::PriorityQueue".
 
@@ -386,9 +431,10 @@ namespace Anabatic {
     // Mode sub-classe.
       class Mode : public Hurricane::BaseFlags {
         public:
-          enum Flag { NoMode    = 0
+          enum Flag { NoMode     = 0
-                    , Standart  = (1<<0)
+                    , Standart   = (1<<0)
-                    , Monotonic = (1<<1)
+                    , Monotonic  = (1<<1)
+                    , AxisTarget = (1<<2)
                     };
         public:
           inline               Mode         ( unsigned int flags=NoMode );
@@ -410,7 +456,7 @@ namespace Anabatic {
       template<typename DistanceT>
       inline DistanceT* setDistance        ( DistanceT );
       inline void       setSearchAreaHalo  ( DbU::Unit );
-             void       load               ( Net* );
+             void       load               ( Net* net ); 
              void       run                ( Mode mode=Mode::Standart );
     private:           
                         Dijkstra           ( const Dijkstra& );
@@ -427,6 +473,14 @@ namespace Anabatic {
              void       _toSources         ( Vertex*, int connexId );
              void       _getConnecteds     ( Vertex*, VertexSet& );
              void       _checkEdges        () const;
+             void       _createSelfSymSeg  ( Segment* );
+
+             inline void setAxisTarget     ();
+             inline bool needAxisTarget    () const;
+             inline void setFlags          ( unsigned int );
+             inline void unsetFlags        ( unsigned int );
+                    void setAxisTargets    ();
+                    void unsetAxisTargets  ();
     private:
       AnabaticEngine*  _anabatic;
       vector<Vertex*>  _vertexes;
@@ -440,6 +494,7 @@ namespace Anabatic {
       DbU::Unit        _searchAreaHalo;
       int              _connectedsId;
       PriorityQueue    _queue;
+      unsigned int     _flags;
   };
 
 
@@ -455,6 +510,9 @@ namespace Anabatic {
   template<typename DistanceT>
   inline DistanceT* Dijkstra::setDistance       ( DistanceT cb ) { _distanceCb = cb; return _distanceCb.target<DistanceT>(); }
 
+  inline void       Dijkstra::setFlags       ( unsigned int mask ) { _flags |= mask; }
+  inline  bool      Dijkstra::needAxisTarget () const { return (_flags & Mode::AxisTarget); }
+  inline void       Dijkstra::unsetFlags     ( unsigned int mask ) { _flags &= ~mask; }
 }  // Anabatic namespace.
 
 

hurricane/src/hurricane/NetRoutingProperty.cpp

@@ -28,6 +28,14 @@ namespace Hurricane {
 // -------------------------------------------------------------------
 // Class  :  "NetRoutingState"
 
+  DbU::Unit NetRoutingState::getSymValue( DbU::Unit v ) const
+  {
+    if (v < _axis) {
+      return _axis + (_axis-v);
+    } else return _axis;
+  }
+
+
   string  NetRoutingState::_getString () const
   {
     string  s;

hurricane/src/hurricane/hurricane/NetRoutingProperty.h

@@ -60,6 +60,7 @@ namespace Hurricane {
       inline  bool          isSymHorizontal        () const;
       inline  bool          isSymVertical          () const;
       inline  bool          isSymMaster            () const;
+      inline  bool          isSymSlave             () const;
       inline  Net*          getNet                 () const;
       inline  Net*          getSymNet              () const;
       inline  DbU::Unit     getSymAxis             () const;
@@ -68,6 +69,8 @@ namespace Hurricane {
       inline  void          setSymAxis             ( DbU::Unit );
       inline  void          setFlags               ( unsigned int mask );
       inline  void          unsetFlags             ( unsigned int mask );
+      inline  bool          isSelfSym              () const;
+              DbU::Unit     getSymValue            ( DbU::Unit ) const;
               std::string   _getString             () const;
               Record*       _getRecord             () const;
     private:
@@ -102,7 +105,9 @@ namespace Hurricane {
   inline void          NetRoutingState::unsetFlags             ( unsigned int mask ) { _flags &= ~mask; }
   inline void          NetRoutingState::setNet                 ( Net* net ) { _net = net; }
   inline void          NetRoutingState::setSymNet              ( Net* symNet ) { _symNet = symNet; }
-  inline void          NetRoutingState::setSymAxis             ( DbU::Unit axis ) { _axis = axis; }
+  inline void          NetRoutingState::setSymAxis             ( DbU::Unit axis ) { _axis = axis; } 
+  inline bool          NetRoutingState::isSelfSym              () const { return ( (_symNet == NULL) and (isSymmetric())  ); }
+  inline bool          NetRoutingState::isSymSlave             () const { return ( (_symNet != NULL) and (!isSymMaster()) ); }
 
 
 // -------------------------------------------------------------------