riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Contains work of E. Lao on OpenChams (symmetries).
This commit is contained in:
Jean-Paul Chaput 2016-05-26 18:31:30 +02:00
parent d7bd8a4bf4 47d832e81b
commit 4cb3ea7d92
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlsisapd/src/openChams/src/SlicingTree.cpp
View File

@ -268,7 +268,7 @@ namespace OpenChams {
} }
list<pair <int,int> > SlicingNode::getSymmetries () const const list<pair <int,int> > SlicingNode::getSymmetries () const
{ {
cerr << "Error(list<pair <int,int> > SlicingNode::getSymmetries () const): Symmetries are used in Horizontal or Vertical Node only." << endl; cerr << "Error(list<pair <int,int> > SlicingNode::getSymmetries () const): Symmetries are used in Horizontal or Vertical Node only." << endl;
return list<pair<int,int > >(); return list<pair<int,int > >();

14
vlsisapd/src/openChams/src/vlsisapd/openChams/SlicingTree.h
View File

@ -88,8 +88,8 @@ namespace OpenChams {
virtual void setStep ( double step ); virtual void setStep ( double step );
virtual void setCount ( double count ); virtual void setCount ( double count );
virtual const std::vector<SlicingNode*> getChildren () const; virtual const std::vector<SlicingNode*> getChildren () const;
virtual std::list<std::pair <int,int> > getSymmetries () const; virtual const std::list<std::pair <int,int> > getSymmetries () const;
virtual double getToleranceRatioH() const; virtual double getToleranceRatioH() const;
virtual double getToleranceRatioW() const; virtual double getToleranceRatioW() const;
@ -253,8 +253,9 @@ namespace OpenChams {
inline double getToleranceRatioW() const; inline double getToleranceRatioW() const;
inline double getToleranceBandH () const; inline double getToleranceBandH () const;
inline double getToleranceBandW () const; inline double getToleranceBandW () const;
inline const std::vector<SlicingNode*> getChildren () const;
inline std::list<std::pair <int,int> > getSymmetries () const; inline const std::vector<SlicingNode*> getChildren () const;
inline const std::list<std::pair <int,int> > getSymmetries() const;
void setToleranceRatioH( std::string value ); void setToleranceRatioH( std::string value );
void setToleranceRatioW( std::string value ); void setToleranceRatioW( std::string value );
@ -299,8 +300,9 @@ namespace OpenChams {
inline double HVSlicingNode::getToleranceRatioW() const { return _toleranceRatioW; } inline double HVSlicingNode::getToleranceRatioW() const { return _toleranceRatioW; }
inline double HVSlicingNode::getToleranceBandH () const { return _toleranceBandH ; } inline double HVSlicingNode::getToleranceBandH () const { return _toleranceBandH ; }
inline double HVSlicingNode::getToleranceBandW () const { return _toleranceBandW ; } inline double HVSlicingNode::getToleranceBandW () const { return _toleranceBandW ; }
inline const std::vector<SlicingNode*> HVSlicingNode::getChildren () const { return _children ; }
inline std::list<std::pair<int,int> > HVSlicingNode::getSymmetries () const { return _symmetries ; } inline const std::vector<SlicingNode*> HVSlicingNode::getChildren () const { return _children ; }
inline const std::list<std::pair<int,int> > HVSlicingNode::getSymmetries() const { return _symmetries ; }
inline std::string HVSlicingNode::toleranceRatioHToString() const { return std::to_string(_toleranceRatioH); } inline std::string HVSlicingNode::toleranceRatioHToString() const { return std::to_string(_toleranceRatioH); }
inline std::string HVSlicingNode::toleranceRatioWToString() const { return std::to_string(_toleranceRatioW); } inline std::string HVSlicingNode::toleranceRatioWToString() const { return std::to_string(_toleranceRatioW); }