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

Hurricane cleaning

This commit is contained in:
Christophe Alexandre 2008-04-13 10:12:19 +00:00
parent acdaa2e4f5
commit e019677605
82 changed files with 441 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hurricane/src/hurricane/BasicLayer.cpp
View File

@ -193,12 +193,12 @@ Record* BasicLayer::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Type", &_type)); record->add(getSlot("Type", &_type));
record->Add(getSlot("RedValue", &_redValue)); record->add(getSlot("RedValue", &_redValue));
record->Add(getSlot("GreenValue", &_greenValue)); record->add(getSlot("GreenValue", &_greenValue));
record->Add(getSlot("BlueValue", &_blueValue)); record->add(getSlot("BlueValue", &_blueValue));
record->Add(getSlot("FillPattern", &_fillPattern)); record->add(getSlot("FillPattern", &_fillPattern));
record->Add(getSlot("DisplayThreshold", &_displayThreshold)); record->add(getSlot("DisplayThreshold", &_displayThreshold));
} }
return record; return record;
} }
@ -344,7 +344,7 @@ Record* BasicLayer::Type::_getRecord() const
// *********************************** // ***********************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", &_code)); record->add(getSlot("Code", &_code));
return record; return record;
} }

2
hurricane/src/hurricane/BasicLayer.h
View File

@ -129,7 +129,7 @@ template<>
inline Record* ProxyRecord<BasicLayer::Type::Code> ( const BasicLayer::Type::Code* object ) inline Record* ProxyRecord<BasicLayer::Type::Code> ( const BasicLayer::Type::Code* object )
{ {
Record* record = new Record(getString(object)); Record* record = new Record(getString(object));
record->Add(getSlot("Code", (unsigned int*)object)); record->add(getSlot("Code", (unsigned int*)object));
return record; return record;
} }

8
hurricane/src/hurricane/Box.cpp
View File

@ -332,10 +332,10 @@ Record* Box::_getRecord() const
if (isEmpty()) return NULL; if (isEmpty()) return NULL;
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("XMin", &_xMin)); record->add(getSlot("XMin", &_xMin));
record->Add(getSlot("YMin", &_yMin)); record->add(getSlot("YMin", &_yMin));
record->Add(getSlot("XMax", &_xMax)); record->add(getSlot("XMax", &_xMax));
record->Add(getSlot("YMax", &_yMax)); record->add(getSlot("YMax", &_yMax));
return record; return record;
} }

38
hurricane/src/hurricane/Cell.cpp
View File

@ -109,9 +109,9 @@ void Cell::setName(const Name& name)
if (_library->getCell(name)) if (_library->getCell(name))
throw Error("Can't change " + _TName("Cell") + " name : already exists"); throw Error("Can't change " + _TName("Cell") + " name : already exists");
_library->_getCellMap()._Remove(this); _library->_getCellMap()._remove(this);
_name = name; _name = name;
_library->_getCellMap()._Insert(this); _library->_getCellMap()._insert(this);
} }
} }
@ -130,7 +130,7 @@ void Cell::setAbutmentBox(const Box& abutmentBox)
void Cell::flattenNets(bool buildRings) void Cell::flattenNets(bool buildRings)
// ************************************ // ************************************
{ {
OpenUpdateSession (); openUpdateSession ();
for_each_occurrence ( occurrence, getHyperNetRootNetOccurrences() ) { for_each_occurrence ( occurrence, getHyperNetRootNetOccurrences() ) {
HyperNet hyperNet ( occurrence ); HyperNet hyperNet ( occurrence );
@ -193,7 +193,7 @@ void Cell::flattenNets(bool buildRings)
end_for end_for
} }
CloseUpdateSession (); closeUpdateSession ();
} }
void Cell::materialize() void Cell::materialize()
@ -215,7 +215,7 @@ void Cell::unmaterialize()
void Cell::_postCreate() void Cell::_postCreate()
// ********************* // *********************
{ {
_library->_getCellMap()._Insert(this); _library->_getCellMap()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -236,7 +236,7 @@ void Cell::_preDestroy()
for_each_net(net, getNets()) net->destroy(); end_for; for_each_net(net, getNets()) net->destroy(); end_for;
for_each_slice(slice, getSlices()) slice->_destroy(); end_for; for_each_slice(slice, getSlices()) slice->_destroy(); end_for;
_library->_getCellMap()._Remove(this); _library->_getCellMap()._remove(this);
} }
string Cell::_getString() const string Cell::_getString() const
@ -252,19 +252,19 @@ Record* Cell::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Library", _library)); record->add(getSlot("Library", _library));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Instances", &_instanceMap)); record->add(getSlot("Instances", &_instanceMap));
record->Add(getSlot("QuadTree", &_quadTree)); record->add(getSlot("QuadTree", &_quadTree));
record->Add(getSlot("SlaveInstances", &_slaveInstanceSet)); record->add(getSlot("SlaveInstances", &_slaveInstanceSet));
record->Add(getSlot("Nets", &_netMap)); record->add(getSlot("Nets", &_netMap));
record->Add(getSlot("Pins", &_pinMap)); record->add(getSlot("Pins", &_pinMap));
record->Add(getSlot("Slices", &_sliceMap)); record->add(getSlot("Slices", &_sliceMap));
record->Add(getSlot("Markers", &_markerSet)); record->add(getSlot("Markers", &_markerSet));
record->Add(getSlot("AbutmentBox", &_abutmentBox)); record->add(getSlot("AbutmentBox", &_abutmentBox));
record->Add(getSlot("BoundingBox", &_boundingBox)); record->add(getSlot("BoundingBox", &_boundingBox));
record->Add(getSlot("isTerminal", &_isTerminal)); record->add(getSlot("isTerminal", &_isTerminal));
record->Add(getSlot("isFlattenLeaf", &_isFlattenLeaf)); record->add(getSlot("isFlattenLeaf", &_isFlattenLeaf));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Collection.h
View File

@ -176,7 +176,7 @@ template<class Type> class Collection : public NestedSlotAdapter {
while (locator.isValid()) { while (locator.isValid()) {
string slotName = getString(n++); string slotName = getString(n++);
Type slotRecord = locator.getElement(); Type slotRecord = locator.getElement();
record->Add(getSlot(slotName, slotRecord)); record->add(getSlot(slotName, slotRecord));
locator.progress(); locator.progress();
} }
} }

33
hurricane/src/hurricane/Component.cpp
View File

@ -326,7 +326,7 @@ void Component::materialize()
Slice* slice = cell->getSlice(layer); Slice* slice = cell->getSlice(layer);
if (!slice) slice = Slice::_create(cell, layer); if (!slice) slice = Slice::_create(cell, layer);
QuadTree* quadTree = slice->_getQuadTree(); QuadTree* quadTree = slice->_getQuadTree();
quadTree->Insert(this); quadTree->insert(this);
cell->_fit(quadTree->getBoundingBox()); cell->_fit(quadTree->getBoundingBox());
} else { } else {
//cerr << "[WARNING] " << this << " not inserted into QuadTree." << endl; //cerr << "[WARNING] " << this << " not inserted into QuadTree." << endl;
@ -344,8 +344,8 @@ void Component::unmaterialize()
Slice* slice = cell->getSlice(getLayer()); Slice* slice = cell->getSlice(getLayer());
if (slice) { if (slice) {
cell->_unfit(getBoundingBox()); cell->_unfit(getBoundingBox());
slice->_getQuadTree()->Remove(this); slice->_getQuadTree()->remove(this);
if (slice->IsEmpty()) slice->_destroy(); if (slice->isEmpty()) slice->_destroy();
} }
} }
} }
@ -368,7 +368,7 @@ void Component::invalidate(bool propagateFlag)
void Component::_postCreate() void Component::_postCreate()
// ************************** // **************************
{ {
if (_net) _net->_getComponentSet()._Insert(this); if (_net) _net->_getComponentSet()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -434,7 +434,7 @@ void Component::_preDestroy()
Inherit::_preDestroy(); Inherit::_preDestroy();
if (_net) _net->_getComponentSet()._Remove(this); if (_net) _net->_getComponentSet()._remove(this);
// trace << "exiting Component::_Predestroy:" << endl; // trace << "exiting Component::_Predestroy:" << endl;
@ -457,9 +457,9 @@ Record* Component::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Net", _net)); record->add(getSlot("Net", _net));
record->Add(getSlot("Rubber", _rubber)); record->add(getSlot("Rubber", _rubber));
record->Add(getSlot("BodyHook", &_bodyHook)); record->add(getSlot("BodyHook", &_bodyHook));
} }
return record; return record;
} }
@ -468,9 +468,9 @@ void Component::_setNet(Net* net)
// ****************************** // ******************************
{ {
if (net != _net) { if (net != _net) {
if (_net) _net->_getComponentSet()._Remove(this); if (_net) _net->_getComponentSet()._remove(this);
_net = net; _net = net;
if (_net) _net->_getComponentSet()._Insert(this); if (_net) _net->_getComponentSet()._insert(this);
} }
} }
@ -478,9 +478,9 @@ void Component::_setRubber(Rubber* rubber)
// *************************************** // ***************************************
{ {
if (rubber != _rubber) { if (rubber != _rubber) {
if (_rubber) _rubber->_Release(); if (_rubber) _rubber->_release();
_rubber = rubber; _rubber = rubber;
if (_rubber) _rubber->_Capture(); if (_rubber) _rubber->_capture();
} }
} }
@ -498,15 +498,6 @@ void Component::_setRubber(Rubber* rubber)
// return false; // return false;
//} //}
// //
//void Component::_Highlight(View* view, const Box& updateArea, const Transformation& transformation)
//// ************************************************************************************************
//{
// for_each_basic_layer(basicLayer, getLayer()->getBasicLayers()) {
// _Draw(view, basicLayer, updateArea, transformation);
// end_for;
// }
//}
//
// **************************************************************************************************** // ****************************************************************************************************
// Component::BodyHook implementation // Component::BodyHook implementation

22
hurricane/src/hurricane/CompositeLayer.cpp
View File

@ -165,16 +165,16 @@ Record* CompositeLayer::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Type", &_type)); record->add(getSlot("Type", &_type));
record->Add(getSlot("BasicLayers", &_basicLayerList)); record->add(getSlot("BasicLayers", &_basicLayerList));
record->Add(getSlot("ContactSizes", &_contactSizeMap)); record->add(getSlot("ContactSizes", &_contactSizeMap));
record->Add(getSlot("SegmentSizes", &_segmentSizeMap)); record->add(getSlot("SegmentSizes", &_segmentSizeMap));
record->Add(getSlot("SegmentExtentions", &_segmentExtentionMap)); record->add(getSlot("SegmentExtentions", &_segmentExtentionMap));
record->Add(getSlot("PadSizes", &_padSizeMap)); record->add(getSlot("PadSizes", &_padSizeMap));
record->Add(getSlot("MaximalContactSize", &_maximalContactSize)); record->add(getSlot("MaximalContactSize", &_maximalContactSize));
record->Add(getSlot("MaximalSegmentSize", &_maximalSegmentSize)); record->add(getSlot("MaximalSegmentSize", &_maximalSegmentSize));
record->Add(getSlot("MaximalSegmentExtention", &_maximalSegmentExtention)); record->add(getSlot("MaximalSegmentExtention", &_maximalSegmentExtention));
record->Add(getSlot("MaximalPadSize", &_maximalPadSize)); record->add(getSlot("MaximalPadSize", &_maximalPadSize));
} }
return record; return record;
} }
@ -233,7 +233,7 @@ Record* CompositeLayer::Type::_getRecord() const
// ********************************************* // *********************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", (int)_code)); record->add(getSlot("Code", (int)_code));
return record; return record;
} }

14
hurricane/src/hurricane/Contact.cpp
View File

@ -331,13 +331,13 @@ Record* Contact::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("AnchorHook", &_anchorHook)); record->add(getSlot("AnchorHook", &_anchorHook));
record->Add(getSlot("Anchor", getAnchor())); record->add(getSlot("Anchor", getAnchor()));
record->Add(getSlot("Layer", _layer)); record->add(getSlot("Layer", _layer));
record->Add(getSlot("Dx", &_dx)); record->add(getSlot("Dx", &_dx));
record->Add(getSlot("Dy", &_dy)); record->add(getSlot("Dy", &_dy));
record->Add(getSlot("Width", &_width)); record->add(getSlot("Width", &_width));
record->Add(getSlot("Height", &_height)); record->add(getSlot("Height", &_height));
} }
return record; return record;
} }

2
hurricane/src/hurricane/DBo.cpp
View File

@ -141,7 +141,7 @@ Record* DBo::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("Properties", &_propertySet)); record->add(getSlot("Properties", &_propertySet));
} }
return record; return record;
} }

4
hurricane/src/hurricane/DRCError.cpp
View File

@ -63,8 +63,8 @@ Record* DRCError::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("BoundingBox", &_boundingBox)); record->add(getSlot("BoundingBox", &_boundingBox));
} }
return record; return record;
} }

14
hurricane/src/hurricane/DataBase.cpp
View File

@ -53,12 +53,12 @@ void DataBase::_postCreate()
void DataBase::_preDestroy() void DataBase::_preDestroy()
// ************************ // ************************
{ {
OpenUpdateSession(); openUpdateSession();
Inherit::_preDestroy(); Inherit::_preDestroy();
if (_rootLibrary) _rootLibrary->destroy(); if (_rootLibrary) _rootLibrary->destroy();
if (_technology) _technology->destroy(); if (_technology) _technology->destroy();
CloseUpdateSession (); closeUpdateSession ();
DATA_BASE = NULL; DATA_BASE = NULL;
} }
@ -74,11 +74,11 @@ Record* DataBase::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Technology", _technology)); record->add(getSlot("Technology", _technology));
record->Add(getSlot("RootLibrary", _rootLibrary)); record->add(getSlot("RootLibrary", _rootLibrary));
record->Add(getSlot("Precision", getPrecision())); record->add(getSlot("Precision", getPrecision()));
record->Add(getSlot("Resolution", getValueString(1))); record->add(getSlot("Resolution", getValueString(1)));
record->Add(getSlot("GridStep", getValueString(getGridStep()))); record->add(getSlot("GridStep", getValueString(getGridStep())));
} }
return record; return record;
} }

2
hurricane/src/hurricane/DeepNet.cpp
View File

@ -113,7 +113,7 @@ Record* DeepNet::_getRecord () const
{ {
Record* record = Net::_getRecord(); Record* record = Net::_getRecord();
if (record) { if (record) {
record->Add(getSlot("_netOccurrence", &_netOccurrence)); record->add(getSlot("_netOccurrence", &_netOccurrence));
} }
return record; return record;
} }

2
hurricane/src/hurricane/DeepNet.h
View File

@ -91,7 +91,7 @@ namespace Hurricane {
// Predicates. // Predicates.
public: public:
virtual bool IsDeepNet () const { return true; }; virtual bool isDeepNet () const { return true; };
// Internal Modifiers. // Internal Modifiers.
public: public:

18
hurricane/src/hurricane/DisplaySlot.cpp
View File

@ -72,7 +72,7 @@ void DisplaySlot::_postCreate()
put(relation); put(relation);
} }
void DisplaySlot::Show() void DisplaySlot::show()
// ********************* // *********************
{ {
if (!_isVisible) { if (!_isVisible) {
@ -85,7 +85,7 @@ void DisplaySlot::Show()
} }
} }
void DisplaySlot::Hide() void DisplaySlot::hide()
// ********************* // *********************
{ {
if (_isVisible) { if (_isVisible) {
@ -93,16 +93,16 @@ void DisplaySlot::Hide()
} }
} }
void DisplaySlot::Flush() void DisplaySlot::flush()
// ********************** // **********************
{ {
OpenUpdateSession(); openUpdateSession();
vector<Go*> govect; vector<Go*> govect;
_quadTree.getGos().fill(govect); _quadTree.getGos().fill(govect);
for (unsigned i = 0 ; i < govect.size() ; i++) { for (unsigned i = 0 ; i < govect.size() ; i++) {
govect[i]->destroy(); govect[i]->destroy();
} }
CloseUpdateSession(); closeUpdateSession();
} }
UserGos DisplaySlot::getUserGos() const UserGos DisplaySlot::getUserGos() const
@ -130,10 +130,10 @@ Record* DisplaySlot::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Cell", _cell)); record->add(getSlot("Cell", _cell));
record->Add(getSlot("Name", _name)); record->add(getSlot("Name", _name));
record->Add(getSlot("QuadTree", &_quadTree)); record->add(getSlot("QuadTree", &_quadTree));
record->Add(getSlot("Is Visible", _isVisible)); record->add(getSlot("Is Visible", _isVisible));
} }
return record; return record;
} }

8
hurricane/src/hurricane/DisplaySlot.h
View File

@ -54,13 +54,13 @@ class DisplaySlot : public DBo {
// Predicates // Predicates
// ********** // **********
public: bool IsVisible() const {return _isVisible;}; public: bool isVisible() const {return _isVisible;};
public: void Show(); public: void show();
public: void Hide(); public: void hide();
// Updators // Updators
// ******** // ********
public: void Flush(); public: void flush();
// Others // Others
// ****** // ******

2
hurricane/src/hurricane/Entity.cpp
View File

@ -82,7 +82,7 @@ Record* Entity::_getRecord() const
if (record) { if (record) {
Occurrence occurrence = Occurrence(this); Occurrence occurrence = Occurrence(this);
if (occurrence.hasProperty()) if (occurrence.hasProperty())
record->Add(getSlot("Occurrence", occurrence)); record->add(getSlot("Occurrence", occurrence));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Go.cpp
View File

@ -76,7 +76,7 @@ Record* Go::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("QuadTree", _quadTree)); record->add(getSlot("QuadTree", _quadTree));
} }
return record; return record;
} }

4
hurricane/src/hurricane/Hook.cpp
View File

@ -366,8 +366,8 @@ Record* Hook::_getRecord() const
Record* record = NULL; Record* record = NULL;
if (_nextHook != this) { if (_nextHook != this) {
record = new Record(getString(this)); record = new Record(getString(this));
record->Add(getSlot("Component", getComponent())); record->add(getSlot("Component", getComponent()));
record->Add(getSlot("NextHook", _nextHook)); record->add(getSlot("NextHook", _nextHook));
} }
return record; return record;
} }

6
hurricane/src/hurricane/Horizontal.cpp
View File

@ -160,9 +160,9 @@ Record* Horizontal::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Y", &_y)); record->add(getSlot("Y", &_y));
record->Add(getSlot("DxSource", &_dxSource)); record->add(getSlot("DxSource", &_dxSource));
record->Add(getSlot("DxTarget", &_dxTarget)); record->add(getSlot("DxTarget", &_dxTarget));
} }
return record; return record;
} }

2
hurricane/src/hurricane/HyperNet.cpp
View File

@ -303,7 +303,7 @@ Record* HyperNet::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("NetOccurrence", &_netOccurrence)); record->add(getSlot("NetOccurrence", &_netOccurrence));
} }
return record; return record;
} }

44
hurricane/src/hurricane/Instance.cpp
View File

@ -295,7 +295,7 @@ void Instance::materialize()
Box boundingBox = getBoundingBox(); Box boundingBox = getBoundingBox();
if (!boundingBox.isEmpty()) { if (!boundingBox.isEmpty()) {
QuadTree* quadTree = _cell->_getQuadTree(); QuadTree* quadTree = _cell->_getQuadTree();
quadTree->Insert(this); quadTree->insert(this);
_cell->_fit(quadTree->getBoundingBox()); _cell->_fit(quadTree->getBoundingBox());
} }
} }
@ -306,7 +306,7 @@ void Instance::unmaterialize()
{ {
if (isMaterialized()) { if (isMaterialized()) {
_cell->_unfit(getBoundingBox()); _cell->_unfit(getBoundingBox());
_cell->_getQuadTree()->Remove(this); _cell->_getQuadTree()->remove(this);
} }
} }
@ -345,9 +345,9 @@ void Instance::setName(const Name& name)
if (_cell->getInstance(name)) if (_cell->getInstance(name))
throw Error("Can't change instance name : already exists"); throw Error("Can't change instance name : already exists");
_cell->_getInstanceMap()._Remove(this); _cell->_getInstanceMap()._remove(this);
_name = name; _name = name;
_cell->_getInstanceMap()._Insert(this); _cell->_getInstanceMap()._insert(this);
} }
} }
@ -408,16 +408,16 @@ void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
while (!connectedPlugList.empty() && !masterNetList.empty()) { while (!connectedPlugList.empty() && !masterNetList.empty()) {
Plug* plug = connectedPlugList.front(); Plug* plug = connectedPlugList.front();
Net* masterNet = masterNetList.front(); Net* masterNet = masterNetList.front();
_plugMap._Remove(plug); _plugMap._remove(plug);
plug->_setMasterNet(masterNet); plug->_setMasterNet(masterNet);
_plugMap._Insert(plug); _plugMap._insert(plug);
connectedPlugList.pop_front(); connectedPlugList.pop_front();
masterNetList.pop_front(); masterNetList.pop_front();
} }
_masterCell->_getSlaveInstanceSet()._Remove(this); _masterCell->_getSlaveInstanceSet()._remove(this);
_masterCell = masterCell; _masterCell = masterCell;
_masterCell->_getSlaveInstanceSet()._Insert(this); _masterCell->_getSlaveInstanceSet()._insert(this);
for_each_net(externalNet, _masterCell->getExternalNets()) { for_each_net(externalNet, _masterCell->getExternalNets()) {
if (!getPlug(externalNet)) Plug::_create(this, externalNet); if (!getPlug(externalNet)) Plug::_create(this, externalNet);
@ -429,8 +429,8 @@ void Instance::setMasterCell(Cell* masterCell, bool secureFlag)
void Instance::_postCreate() void Instance::_postCreate()
// ************************* // *************************
{ {
_cell->_getInstanceMap()._Insert(this); _cell->_getInstanceMap()._insert(this);
_masterCell->_getSlaveInstanceSet()._Insert(this); _masterCell->_getSlaveInstanceSet()._insert(this);
for_each_net(externalNet, _masterCell->getExternalNets()) { for_each_net(externalNet, _masterCell->getExternalNets()) {
Plug::_create(this, externalNet); Plug::_create(this, externalNet);
@ -449,8 +449,8 @@ void Instance::_preDestroy()
for_each_plug(plug, getPlugs()) plug->_destroy(); end_for; for_each_plug(plug, getPlugs()) plug->_destroy(); end_for;
_masterCell->_getSlaveInstanceSet()._Remove(this); _masterCell->_getSlaveInstanceSet()._remove(this);
_cell->_getInstanceMap()._Remove(this); _cell->_getInstanceMap()._remove(this);
} }
string Instance::_getString() const string Instance::_getString() const
@ -467,15 +467,15 @@ Record* Instance::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Cell", _cell)); record->add(getSlot("Cell", _cell));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("MasterCell", _masterCell)); record->add(getSlot("MasterCell", _masterCell));
record->Add(getSlot("Transformation", &_transformation)); record->add(getSlot("Transformation", &_transformation));
record->Add(getSlot("PlacementStatus", _placementStatus)); record->add(getSlot("PlacementStatus", _placementStatus));
record->Add(getSlot("XCenter", getValue(getAbutmentBox().getXCenter()))); record->add(getSlot("XCenter", getValue(getAbutmentBox().getXCenter())));
record->Add(getSlot("YCenter", getValue(getAbutmentBox().getYCenter()))); record->add(getSlot("YCenter", getValue(getAbutmentBox().getYCenter())));
record->Add(getSlot("Plugs", &_plugMap)); record->add(getSlot("Plugs", &_plugMap));
record->Add(getSlot("SharedPathes", &_sharedPathMap)); record->add(getSlot("SharedPathes", &_sharedPathMap));
} }
return record; return record;
} }
@ -697,7 +697,7 @@ Record* Instance::PlacementStatus::_getRecord() const
// ******************************************** // ********************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", &_code)); record->add(getSlot("Code", &_code));
return record; return record;
} }

2
hurricane/src/hurricane/Instance.h
View File

@ -203,7 +203,7 @@ template<>
( const Instance::PlacementStatus::Code* object ) ( const Instance::PlacementStatus::Code* object )
{ {
Record* record = new Record(getString(object)); Record* record = new Record(getString(object));
record->Add(getSlot("Code", (unsigned int*)object)); record->add(getSlot("Code", (unsigned int*)object));
return record; return record;
} }

4
hurricane/src/hurricane/Interval.cpp
View File

@ -218,8 +218,8 @@ Record* Interval::_getRecord() const
// *************************** // ***************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("VMin", &_vMin)); record->add(getSlot("VMin", &_vMin));
record->Add(getSlot("VMin", &_vMax)); record->add(getSlot("VMin", &_vMax));
return record; return record;
} }

18
hurricane/src/hurricane/IntrusiveMap.h
View File

@ -330,8 +330,8 @@ template<class Key, class Element> class IntrusiveMap {
/**/ /**/
Element* element = _array[index]; Element* element = _array[index];
while (element) { while (element) {
// record->Add(getSlot(getString(n++), element)); // record->add(getSlot(getString(n++), element));
record->Add(getSlot(getString(index) + ":" + getString(n++), element)); record->add(getSlot(getString(index) + ":" + getString(n++), element));
/**/ /**/
element = _getNextElement(element); element = _getNextElement(element);
} }
@ -358,7 +358,7 @@ template<class Key, class Element> class IntrusiveMap {
return _array; return _array;
}; };
public: bool _Contains(Element* element) const public: bool _contains(Element* element) const
// ******************************************* // *******************************************
{ {
unsigned index = (_getHashValue(_getKey(element)) / 8) % _length; unsigned index = (_getHashValue(_getKey(element)) / 8) % _length;
@ -368,22 +368,22 @@ template<class Key, class Element> class IntrusiveMap {
return (currentElement != NULL); return (currentElement != NULL);
}; };
public: void _Insert(Element* element) public: void _insert(Element* element)
// *********************************** // ***********************************
{ {
if (!_Contains(element)) { if (!_contains(element)) {
unsigned index = (_getHashValue(_getKey(element)) / 8) % _length; unsigned index = (_getHashValue(_getKey(element)) / 8) % _length;
_setNextElement(element, _array[index]); _setNextElement(element, _array[index]);
_array[index] = element; _array[index] = element;
_size++; _size++;
_Resize(); _resize();
} }
}; };
public: void _Remove(Element* element) public: void _remove(Element* element)
// *********************************** // ***********************************
{ {
if (_Contains(element)) { if (_contains(element)) {
unsigned index = (_getHashValue(_getKey(element)) / 8) % _length; unsigned index = (_getHashValue(_getKey(element)) / 8) % _length;
Element* currentElement = _array[index]; Element* currentElement = _array[index];
if (currentElement) { if (currentElement) {
@ -405,7 +405,7 @@ template<class Key, class Element> class IntrusiveMap {
} }
}; };
public: void _Resize() public: void _resize()
// ******************* // *******************
{ {
unsigned newLength = _length; unsigned newLength = _length;

24
hurricane/src/hurricane/IntrusiveSet.h
View File

@ -274,7 +274,7 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
// Predicates // Predicates
// ********** // **********
public: bool IsEmpty() const public: bool isEmpty() const
// ************************* // *************************
{ {
return (_size == 0); return (_size == 0);
@ -312,7 +312,7 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
public: string _getString() const public: string _getString() const
// ****************************** // ******************************
{ {
if (IsEmpty()) if (isEmpty())
return "<" + _getTypeName() + " empty>"; return "<" + _getTypeName() + " empty>";
else else
return "<" + _getTypeName() + " " + getString(_size) + ">"; return "<" + _getTypeName() + " " + getString(_size) + ">";
@ -322,7 +322,7 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
// ************************* // *************************
{ {
Record* record = NULL; Record* record = NULL;
if (!IsEmpty()) { if (!isEmpty()) {
record = new Record(getString(this)); record = new Record(getString(this));
unsigned n = 1; unsigned n = 1;
for (unsigned index = 0; index < _length; index++) { for (unsigned index = 0; index < _length; index++) {
@ -331,8 +331,8 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
/**/ /**/
Element* element = _array[index]; Element* element = _array[index];
while (element) { while (element) {
// record->Add(getSlot(getString(n++), element)); // record->add(getSlot(getString(n++), element));
record->Add(getSlot(getString(index) + ":" + getString(n++), element)); record->add(getSlot(getString(index) + ":" + getString(n++), element));
/**/ /**/
element = _getNextElement(element); element = _getNextElement(element);
} }
@ -359,7 +359,7 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
return _array; return _array;
}; };
public: bool _Contains(Element* element) const public: bool _contains(Element* element) const
// ******************************************* // *******************************************
{ {
unsigned index = (_getHashValue(element) / 8) % _length; unsigned index = (_getHashValue(element) / 8) % _length;
@ -369,22 +369,22 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
return (currentElement != NULL); return (currentElement != NULL);
}; };
public: void _Insert(Element* element) public: void _insert(Element* element)
// *********************************** // ***********************************
{ {
if (!_Contains(element)) { if (!_contains(element)) {
unsigned index = (_getHashValue(element) / 8) % _length; unsigned index = (_getHashValue(element) / 8) % _length;
_setNextElement(element, _array[index]); _setNextElement(element, _array[index]);
_array[index] = element; _array[index] = element;
_size++; _size++;
_Resize(); _resize();
} }
}; };
public: void _Remove(Element* element) public: void _remove(Element* element)
// *********************************** // ***********************************
{ {
if (_Contains(element)) { if (_contains(element)) {
unsigned index = (_getHashValue(element) / 8) % _length; unsigned index = (_getHashValue(element) / 8) % _length;
Element* currentElement = _array[index]; Element* currentElement = _array[index];
if (currentElement) { if (currentElement) {
@ -406,7 +406,7 @@ template<class Element> class IntrusiveSet : public NestedSlotAdapter {
} }
}; };
public: void _Resize() public: void _resize()
// ******************* // *******************
{ {
unsigned newLength = _length; unsigned newLength = _length;

22
hurricane/src/hurricane/Layer.cpp
View File

@ -60,9 +60,9 @@ void Layer::setName(const Name& name)
if (_technology->getLayer(name)) if (_technology->getLayer(name))
throw Error("Can't change layer name : already exists"); throw Error("Can't change layer name : already exists");
_technology->_getLayerMap()._Remove(this); _technology->_getLayerMap()._remove(this);
_name = name; _name = name;
_technology->_getLayerMap()._Insert(this); _technology->_getLayerMap()._insert(this);
} }
} }
@ -87,7 +87,7 @@ void Layer::setPitch(const Unit& pitch)
void Layer::_postCreate() void Layer::_postCreate()
// ********************** // **********************
{ {
_technology->_getLayerMap()._Insert(this); _technology->_getLayerMap()._insert(this);
_technology->_getLayerList().push_back(this); _technology->_getLayerList().push_back(this);
Inherit::_postCreate(); Inherit::_postCreate();
@ -99,7 +99,7 @@ void Layer::_preDestroy()
Inherit::_preDestroy(); Inherit::_preDestroy();
_technology->_getLayerList().remove(this); _technology->_getLayerList().remove(this);
_technology->_getLayerMap()._Remove(this); _technology->_getLayerMap()._remove(this);
} }
string Layer::_getString() const string Layer::_getString() const
@ -115,13 +115,13 @@ Record* Layer::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Technology", _technology)); record->add(getSlot("Technology", _technology));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Mask", &_mask)); record->add(getSlot("Mask", &_mask));
record->Add(getSlot("ExtractMask", &_extractMask)); record->add(getSlot("ExtractMask", &_extractMask));
record->Add(getSlot("MinimalSize", &_minimalSize)); record->add(getSlot("MinimalSize", &_minimalSize));
record->Add(getSlot("MinimalSpacing", &_minimalSpacing)); record->add(getSlot("MinimalSpacing", &_minimalSpacing));
record->Add(getSlot("Pitch", &_pitch)); record->add(getSlot("Pitch", &_pitch));
} }
return record; return record;
} }

20
hurricane/src/hurricane/Library.cpp
View File

@ -67,7 +67,7 @@ Library* Library::create(Library* library, const Name& name)
return library; return library;
} }
void Library::SetName(const Name& name) void Library::setName(const Name& name)
// ************************************ // ************************************
{ {
if (name != _name) { if (name != _name) {
@ -77,9 +77,9 @@ void Library::SetName(const Name& name)
if (_library && _library->getLibrary(name)) if (_library && _library->getLibrary(name))
throw Error("Can't change library name : already exists"); throw Error("Can't change library name : already exists");
if (_library) _library->_getLibraryMap()._Remove(this); if (_library) _library->_getLibraryMap()._remove(this);
_name = name; _name = name;
if (_library) _library->_getLibraryMap()._Insert(this); if (_library) _library->_getLibraryMap()._insert(this);
} }
} }
@ -89,7 +89,7 @@ void Library::_postCreate()
if (!_library) if (!_library)
_dataBase->_setRootLibrary(this); _dataBase->_setRootLibrary(this);
else else
_library->_getLibraryMap()._Insert(this); _library->_getLibraryMap()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -105,7 +105,7 @@ void Library::_preDestroy()
if (!_library) if (!_library)
_dataBase->_setRootLibrary(NULL); _dataBase->_setRootLibrary(NULL);
else else
_library->_getLibraryMap()._Remove(this); _library->_getLibraryMap()._remove(this);
} }
string Library::_getString() const string Library::_getString() const
@ -122,11 +122,11 @@ Record* Library::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("DataBase", _dataBase)); record->add(getSlot("DataBase", _dataBase));
record->Add(getSlot("Library", _library)); record->add(getSlot("Library", _library));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Libraries", &_libraryMap)); record->add(getSlot("Libraries", &_libraryMap));
record->Add(getSlot("Cells", &_cellMap)); record->add(getSlot("Cells", &_cellMap));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Library.h
View File

@ -90,7 +90,7 @@ class Library : public DBo {
// Updators // Updators
// ******** // ********
public: void SetName(const Name& name); public: void setName(const Name& name);
// Others // Others
// ****** // ******

2
hurricane/src/hurricane/ListCollection.h
View File

@ -165,7 +165,7 @@ template<class Element> class ListCollection : public Collection<Element> {
while (iterator != _elementList->end()) { while (iterator != _elementList->end()) {
string slotName = getString(n++); string slotName = getString(n++);
Element slotObject = *iterator; Element slotObject = *iterator;
record->Add(getSlot(slotName, slotObject)); record->add(getSlot(slotName, slotObject));
++iterator; ++iterator;
} }
} }

2
hurricane/src/hurricane/MapCollection.h
View File

@ -163,7 +163,7 @@ template<class Key, class Element, class Compare = less<Key> >
record = new Record(_GetString()); record = new Record(_GetString());
typename map<Key, Element, Compare>::const_iterator iterator = _elementMap->begin(); // AD typename map<Key, Element, Compare>::const_iterator iterator = _elementMap->begin(); // AD
while (iterator != _elementMap->end()) { while (iterator != _elementMap->end()) {
record->Add(GetSlot(GetString((*iterator).first), (*iterator).second)); record->add(GetSlot(GetString((*iterator).first), (*iterator).second));
++iterator; ++iterator;
} }
} }

10
hurricane/src/hurricane/Marker.cpp
View File

@ -33,7 +33,7 @@ void Marker::materialize()
if (!isMaterialized()) { if (!isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
QuadTree* quadTree = cell->_getQuadTree(); QuadTree* quadTree = cell->_getQuadTree();
quadTree->Insert(this); quadTree->insert(this);
cell->_fit(quadTree->getBoundingBox()); cell->_fit(quadTree->getBoundingBox());
} }
} }
@ -44,14 +44,14 @@ void Marker::unmaterialize()
if (isMaterialized()) { if (isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
cell->_unfit(getBoundingBox()); cell->_unfit(getBoundingBox());
cell->_getQuadTree()->Remove(this); cell->_getQuadTree()->remove(this);
} }
} }
void Marker::_postCreate() void Marker::_postCreate()
// *********************** // ***********************
{ {
_cell->_getMarkerSet()._Insert(this); _cell->_getMarkerSet()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -61,7 +61,7 @@ void Marker::_preDestroy()
{ {
Inherit::_preDestroy(); Inherit::_preDestroy();
_cell->_getMarkerSet()._Remove(this); _cell->_getMarkerSet()._remove(this);
} }
string Marker::_getString() const string Marker::_getString() const
@ -77,7 +77,7 @@ Record* Marker::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Cell", _cell)); record->add(getSlot("Cell", _cell));
} }
return record; return record;
} }

2
hurricane/src/hurricane/MultisetCollection.h
View File

@ -163,7 +163,7 @@ template<class Element, class Compare = less<Element> >
unsigned n = 1; unsigned n = 1;
typename multiset<Element, Compare>::const_iterator iterator = _elementMultiset->begin(); // AD typename multiset<Element, Compare>::const_iterator iterator = _elementMultiset->begin(); // AD
while (iterator != _elementMultiset->end()) { while (iterator != _elementMultiset->end()) {
record->Add(getSlot(getString(n++), *iterator)); record->add(getSlot(getString(n++), *iterator));
++iterator; ++iterator;
} }
} }

16
hurricane/src/hurricane/Name.cpp
View File

@ -33,7 +33,7 @@ Name::Name()
assert(_sharedName); assert(_sharedName);
_sharedName->Capture(); _sharedName->capture();
} }
Name::Name(const char* c) Name::Name(const char* c)
@ -54,7 +54,7 @@ Name::Name(const char* c)
assert(_sharedName); assert(_sharedName);
_sharedName->Capture(); _sharedName->capture();
} }
Name::Name(const string& s) Name::Name(const string& s)
@ -74,20 +74,20 @@ Name::Name(const string& s)
assert(_sharedName); assert(_sharedName);
_sharedName->Capture(); _sharedName->capture();
} }
Name::Name(const Name& name) Name::Name(const Name& name)
// ************************* // *************************
: _sharedName(name._sharedName) : _sharedName(name._sharedName)
{ {
_sharedName->Capture(); _sharedName->capture();
} }
Name::~Name() Name::~Name()
// ********** // **********
{ {
_sharedName->Release(); _sharedName->release();
} }
Name& Name::operator=(const Name& name) Name& Name::operator=(const Name& name)
@ -95,9 +95,9 @@ Name& Name::operator=(const Name& name)
{ {
SharedName* sharedName = name._sharedName; SharedName* sharedName = name._sharedName;
if (sharedName != _sharedName) { if (sharedName != _sharedName) {
_sharedName->Release(); _sharedName->release();
_sharedName = sharedName; _sharedName = sharedName;
_sharedName->Capture(); _sharedName->capture();
} }
return *this; return *this;
} }
@ -164,7 +164,7 @@ Record* Name::_getRecord() const
// *********************** // ***********************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("SharedName", _sharedName)); record->add(getSlot("SharedName", _sharedName));
return record; return record;
} }

38
hurricane/src/hurricane/Net.cpp
View File

@ -420,9 +420,9 @@ void Net::setName(const Name& name)
if (_cell->getNet(name)) if (_cell->getNet(name))
throw Error("Can't change net name : already exists"); throw Error("Can't change net name : already exists");
_cell->_getNetMap()._Remove(this); _cell->_getNetMap()._remove(this);
_name = name; _name = name;
_cell->_getNetMap()._Insert(this); _cell->_getNetMap()._insert(this);
} }
} }
@ -449,13 +449,13 @@ void Net::setExternal(bool isExternal)
} }
_isExternal = isExternal; _isExternal = isExternal;
if (_isExternal) { if (_isExternal) {
OpenUpdateSession(); openUpdateSession();
setPosition(Point(0, 0)); setPosition(Point(0, 0));
for_each_instance(instance, _cell->getSlaveInstances()) { for_each_instance(instance, _cell->getSlaveInstances()) {
Plug::_create(instance, this); Plug::_create(instance, this);
end_for; end_for;
} }
CloseUpdateSession(); closeUpdateSession();
} }
} }
} }
@ -586,7 +586,7 @@ void Net::merge(Net* net)
void Net::_postCreate() void Net::_postCreate()
// ******************** // ********************
{ {
_cell->_getNetMap()._Insert(this); _cell->_getNetMap()._insert(this);
if (_isExternal) { if (_isExternal) {
for_each_instance(instance, _cell->getSlaveInstances()) { for_each_instance(instance, _cell->getSlaveInstances()) {
@ -628,7 +628,7 @@ void Net::_preDestroy()
end_for; end_for;
} }
_cell->_getNetMap()._Remove(this); _cell->_getNetMap()._remove(this);
} }
string Net::_getString() const string Net::_getString() const
@ -644,17 +644,17 @@ Record* Net::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Cell", _cell)); record->add(getSlot("Cell", _cell));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Arity", &_arity)); record->add(getSlot("Arity", &_arity));
record->Add(getSlot("Global", &_isGlobal)); record->add(getSlot("Global", &_isGlobal));
record->Add(getSlot("External", &_isExternal)); record->add(getSlot("External", &_isExternal));
record->Add(getSlot("Type", _type)); record->add(getSlot("Type", _type));
record->Add(getSlot("Direction", _direction)); record->add(getSlot("Direction", _direction));
record->Add(getSlot("Position", &_position)); record->add(getSlot("Position", &_position));
record->Add(getSlot("Components", &_componentSet)); record->add(getSlot("Components", &_componentSet));
record->Add(getSlot("Rubbers", &_rubberSet)); record->add(getSlot("Rubbers", &_rubberSet));
record->Add(getSlot("External", &_isExternal)); record->add(getSlot("External", &_isExternal));
} }
return record; return record;
} }
@ -692,7 +692,7 @@ Record* Net::Type::_getRecord() const
// **************************** // ****************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", &_code)); record->add(getSlot("Code", &_code));
return record; return record;
} }
@ -731,7 +731,7 @@ Record* Net::Direction::_getRecord() const
// ********************************* // *********************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", &_code)); record->add(getSlot("Code", &_code));
return record; return record;
} }

4
hurricane/src/hurricane/Net.h
View File

@ -246,7 +246,7 @@ template<>
( const Net::Type::Code* object ) ( const Net::Type::Code* object )
{ {
Record* record = new Record(getString(object)); Record* record = new Record(getString(object));
record->Add(getSlot("Code", (unsigned int*)object)); record->add(getSlot("Code", (unsigned int*)object));
return record; return record;
} }
@ -280,7 +280,7 @@ template<>
( const Net::Direction::Code* object ) ( const Net::Direction::Code* object )
{ {
Record* record = new Record(getString(object)); Record* record = new Record(getString(object));
record->Add(getSlot("Code", (unsigned int*)object)); record->add(getSlot("Code", (unsigned int*)object));
return record; return record;
} }

6
hurricane/src/hurricane/Occurrence.cpp
View File

@ -199,10 +199,10 @@ Record* Occurrence::_getRecord() const
Record* record = NULL; Record* record = NULL;
if (_entity) { if (_entity) {
record = new Record(getString(this)); record = new Record(getString(this));
record->Add(getSlot("Entity", _entity)); record->add(getSlot("Entity", _entity));
record->Add(getSlot("SharedPath", _sharedPath)); record->add(getSlot("SharedPath", _sharedPath));
Quark* quark = _getQuark(); Quark* quark = _getQuark();
if (quark) record->Add(getSlot("Quark", quark)); if (quark) record->add(getSlot("Quark", quark));
} }
return record; return record;
} }

6
hurricane/src/hurricane/Pad.cpp
View File

@ -87,7 +87,7 @@ void Pad::translate(const Unit& dx, const Unit& dy)
} }
} }
void Pad::SetBoundingBox(const Box& boundingBox) void Pad::setBoundingBox(const Box& boundingBox)
// ********************************************* // *********************************************
{ {
if (_boundingBox.isEmpty()) if (_boundingBox.isEmpty())
@ -113,8 +113,8 @@ Record* Pad::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Layer", _layer)); record->add(getSlot("Layer", _layer));
record->Add(getSlot("BoundingBox", &_boundingBox)); record->add(getSlot("BoundingBox", &_boundingBox));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Pad.h
View File

@ -54,7 +54,7 @@ class Pad : public Component {
// ******** // ********
public: virtual void translate(const Unit& dx, const Unit& dy); public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetBoundingBox(const Box& boundingBox); public: void setBoundingBox(const Box& boundingBox);
// Others // Others
// ****** // ******

2
hurricane/src/hurricane/Path.cpp
View File

@ -250,7 +250,7 @@ Record* Path::_getRecord() const
Record* record = NULL; Record* record = NULL;
if (_sharedPath) { if (_sharedPath) {
record = new Record(getString(this)); record = new Record(getString(this));
record->Add(getSlot("SharedPath", _sharedPath)); record->add(getSlot("SharedPath", _sharedPath));
} }
return record; return record;
} }

16
hurricane/src/hurricane/Pin.cpp
View File

@ -47,7 +47,7 @@ Pin* Pin::create(Net* net, const Name& name, const AccessDirection& accessDirect
return pin; return pin;
} }
void Pin::SetPlacementStatus(const PlacementStatus& placementstatus) void Pin::setPlacementStatus(const PlacementStatus& placementstatus)
// ********************************************************************** // **********************************************************************
{ {
if (placementstatus != _placementStatus) { if (placementstatus != _placementStatus) {
@ -59,7 +59,7 @@ void Pin::SetPlacementStatus(const PlacementStatus& placementstatus)
void Pin::_postCreate() void Pin::_postCreate()
// ********************** // **********************
{ {
getCell()->_getPinMap()._Insert(this); getCell()->_getPinMap()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -69,7 +69,7 @@ void Pin::_preDestroy()
{ {
Inherit::_preDestroy(); Inherit::_preDestroy();
getCell()->_getPinMap()._Remove(this); getCell()->_getPinMap()._remove(this);
} }
string Pin::_getString() const string Pin::_getString() const
@ -86,9 +86,9 @@ Record* Pin::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("AccessDirection", &_accessDirection)); record->add(getSlot("AccessDirection", &_accessDirection));
record->Add(getSlot("PlacementStatus", &_placementStatus)); record->add(getSlot("PlacementStatus", &_placementStatus));
} }
return record; return record;
} }
@ -191,7 +191,7 @@ Record* Pin::AccessDirection::_getRecord() const
// ***************************************** // *****************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", (int)_code)); record->add(getSlot("Code", (int)_code));
return record; return record;
} }
@ -235,7 +235,7 @@ Record* Pin::PlacementStatus::_getRecord() const
// *************************************** // ***************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", (int)_code)); record->add(getSlot("Code", (int)_code));
return record; return record;
} }

8
hurricane/src/hurricane/Pin.h
View File

@ -99,14 +99,14 @@ class Pin : public Contact {
// Predicates // Predicates
// ********** // **********
public: bool IsUnplaced() const {return _placementStatus == PlacementStatus::UNPLACED;}; public: bool isUnplaced() const {return _placementStatus == PlacementStatus::UNPLACED;};
public: bool IsPlaced() const {return _placementStatus == PlacementStatus::PLACED;}; public: bool isPlaced() const {return _placementStatus == PlacementStatus::PLACED;};
public: bool IsFixed() const {return _placementStatus == PlacementStatus::FIXED;}; public: bool isFixed() const {return _placementStatus == PlacementStatus::FIXED;};
// Updators // Updators
// ******** // ********
public: void SetPlacementStatus(const PlacementStatus& placementstatus); public: void setPlacementStatus(const PlacementStatus& placementstatus);
// Others // Others
// ****** // ******

8
hurricane/src/hurricane/Plug.cpp
View File

@ -146,7 +146,7 @@ Plug* Plug::_create(Instance* instance, Net* masterNet)
void Plug::_postCreate() void Plug::_postCreate()
// ********************* // *********************
{ {
_instance->_getPlugMap()._Insert(this); _instance->_getPlugMap()._insert(this);
Inherit::_postCreate(); Inherit::_postCreate();
} }
@ -167,7 +167,7 @@ void Plug::_preDestroy()
Inherit::_preDestroy(); Inherit::_preDestroy();
_instance->_getPlugMap()._Remove(this); _instance->_getPlugMap()._remove(this);
// trace << "exiting Plug::_preDestroy:" << endl; // trace << "exiting Plug::_preDestroy:" << endl;
// trace_out(); // trace_out();
@ -186,8 +186,8 @@ Record* Plug::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Instance", _instance)); record->add(getSlot("Instance", _instance));
record->Add(getSlot("MasterNet", _masterNet)); record->add(getSlot("MasterNet", _masterNet));
} }
return record; return record;
} }

4
hurricane/src/hurricane/Point.cpp
View File

@ -106,8 +106,8 @@ Record* Point::_getRecord() const
// ****************************** // ******************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("X", &_x)); record->add(getSlot("X", &_x));
record->Add(getSlot("Y", &_y)); record->add(getSlot("Y", &_y));
return record; return record;
} }

4
hurricane/src/hurricane/Property.cpp
View File

@ -98,7 +98,7 @@ Record* PrivateProperty::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Owner", _owner)); record->add(getSlot("Owner", _owner));
} }
return record; return record;
} }
@ -159,7 +159,7 @@ Record* SharedProperty::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Owners", &_ownerSet)); record->add(getSlot("Owners", &_ownerSet));
} }
return record; return record;
} }

8
hurricane/src/hurricane/Property.h
View File

@ -199,8 +199,8 @@ template<class Value> class StandardPrivateProperty : public PrivateProperty {
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Value", _value)); record->add(getSlot("Value", _value));
} }
return record; return record;
}; };
@ -343,8 +343,8 @@ template<class Value> class StandardSharedProperty : public SharedProperty {
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Value", &_value)); record->add(getSlot("Value", &_value));
} }
return record; return record;
}; };

84
hurricane/src/hurricane/QuadTree.cpp
View File

@ -233,7 +233,7 @@ Gos QuadTree::getGosUnder(const Box& area) const
return QuadTree_GosUnder(this, area); return QuadTree_GosUnder(this, area);
} }
void QuadTree::Insert(Go* go) void QuadTree::insert(Go* go)
// ************************** // **************************
{ {
if (!go) if (!go)
@ -242,21 +242,21 @@ void QuadTree::Insert(Go* go)
if (!go->isMaterialized()) { if (!go->isMaterialized()) {
Box boundingBox = go->getBoundingBox(); Box boundingBox = go->getBoundingBox();
QuadTree* child = _getDeepestChild(boundingBox); QuadTree* child = _getDeepestChild(boundingBox);
child->_goSet._Insert(go); child->_goSet._insert(go);
go->_quadTree = child; go->_quadTree = child;
QuadTree* parent = child; QuadTree* parent = child;
while (parent) { while (parent) {
parent->_size++; parent->_size++;
if (parent->IsEmpty() || !parent->_boundingBox.isEmpty()) if (parent->isEmpty() || !parent->_boundingBox.isEmpty())
parent->_boundingBox.merge(boundingBox); parent->_boundingBox.merge(boundingBox);
parent = parent->_parent; parent = parent->_parent;
} }
if (QUAD_TREE_EXPLODE_THRESHOLD <= child->_size) if (QUAD_TREE_EXPLODE_THRESHOLD <= child->_size)
child->_Explode(); child->_explode();
} }
} }
void QuadTree::Remove(Go* go) void QuadTree::remove(Go* go)
// ************************** // **************************
{ {
if (!go) if (!go)
@ -265,7 +265,7 @@ void QuadTree::Remove(Go* go)
if (go->isMaterialized()) { if (go->isMaterialized()) {
Box boundingBox = go->getBoundingBox(); Box boundingBox = go->getBoundingBox();
QuadTree* child = go->_quadTree; QuadTree* child = go->_quadTree;
child->_goSet._Remove(go); child->_goSet._remove(go);
go->_quadTree = NULL; go->_quadTree = NULL;
QuadTree* parent = child; QuadTree* parent = child;
while (parent) { while (parent) {
@ -278,7 +278,7 @@ void QuadTree::Remove(Go* go)
while (parent) { while (parent) {
if (!(parent->_size <= QUAD_TREE_IMPLODE_THRESHOLD)) if (!(parent->_size <= QUAD_TREE_IMPLODE_THRESHOLD))
break; break;
parent->_Implode(); parent->_implode();
parent = parent->_parent; parent = parent->_parent;
} }
} }
@ -302,16 +302,16 @@ Record* QuadTree::_getRecord() const
Record* record = NULL; Record* record = NULL;
if (_size) { if (_size) {
record = new Record(getString(this)); record = new Record(getString(this));
record->Add(getSlot("Parent", _parent)); record->add(getSlot("Parent", _parent));
record->Add(getSlot("X", &_x)); record->add(getSlot("X", &_x));
record->Add(getSlot("Y", &_y)); record->add(getSlot("Y", &_y));
record->Add(getSlot("BoundingBox", &_boundingBox)); record->add(getSlot("BoundingBox", &_boundingBox));
record->Add(getSlot("Size", &_size)); record->add(getSlot("Size", &_size));
record->Add(getSlot("Gos", &_goSet)); record->add(getSlot("Gos", &_goSet));
record->Add(getSlot("ULChild", _ulChild)); record->add(getSlot("ULChild", _ulChild));
record->Add(getSlot("URChild", _urChild)); record->add(getSlot("URChild", _urChild));
record->Add(getSlot("LLChild", _llChild)); record->add(getSlot("LLChild", _llChild));
record->Add(getSlot("LRChild", _lrChild)); record->add(getSlot("LRChild", _lrChild));
} }
return record; return record;
} }
@ -319,7 +319,7 @@ Record* QuadTree::_getRecord() const
QuadTree* QuadTree::_getDeepestChild(const Box& box) QuadTree* QuadTree::_getDeepestChild(const Box& box)
// ************************************************ // ************************************************
{ {
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (box.getXMax() < _x) { if (box.getXMax() < _x) {
if (box.getYMax() < _y) if (box.getYMax() < _y)
return _llChild->_getDeepestChild(box); return _llChild->_getDeepestChild(box);
@ -339,9 +339,9 @@ QuadTree* QuadTree::_getDeepestChild(const Box& box)
QuadTree* QuadTree::_getFirstQuadTree() const QuadTree* QuadTree::_getFirstQuadTree() const
// ****************************************** // ******************************************
{ {
if (!_goSet.IsEmpty()) return (QuadTree*)this; if (!_goSet.isEmpty()) return (QuadTree*)this;
QuadTree* quadTree = NULL; QuadTree* quadTree = NULL;
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (!quadTree) quadTree = _ulChild->_getFirstQuadTree(); if (!quadTree) quadTree = _ulChild->_getFirstQuadTree();
if (!quadTree) quadTree = _urChild->_getFirstQuadTree(); if (!quadTree) quadTree = _urChild->_getFirstQuadTree();
if (!quadTree) quadTree = _llChild->_getFirstQuadTree(); if (!quadTree) quadTree = _llChild->_getFirstQuadTree();
@ -354,9 +354,9 @@ QuadTree* QuadTree::_getFirstQuadTree(const Box& area) const
// ********************************************************* // *********************************************************
{ {
if (getBoundingBox().intersect(area)) { if (getBoundingBox().intersect(area)) {
if (!_goSet.IsEmpty()) return (QuadTree*)this; if (!_goSet.isEmpty()) return (QuadTree*)this;
QuadTree* quadTree = NULL; QuadTree* quadTree = NULL;
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (!quadTree) quadTree = _ulChild->_getFirstQuadTree(area); if (!quadTree) quadTree = _ulChild->_getFirstQuadTree(area);
if (!quadTree) quadTree = _urChild->_getFirstQuadTree(area); if (!quadTree) quadTree = _urChild->_getFirstQuadTree(area);
if (!quadTree) quadTree = _llChild->_getFirstQuadTree(area); if (!quadTree) quadTree = _llChild->_getFirstQuadTree(area);
@ -371,7 +371,7 @@ QuadTree* QuadTree::_getNextQuadTree()
// *********************************** // ***********************************
{ {
QuadTree* nextQuadTree = NULL; QuadTree* nextQuadTree = NULL;
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (!nextQuadTree) nextQuadTree = _ulChild->_getFirstQuadTree(); if (!nextQuadTree) nextQuadTree = _ulChild->_getFirstQuadTree();
if (!nextQuadTree) nextQuadTree = _urChild->_getFirstQuadTree(); if (!nextQuadTree) nextQuadTree = _urChild->_getFirstQuadTree();
if (!nextQuadTree) nextQuadTree = _llChild->_getFirstQuadTree(); if (!nextQuadTree) nextQuadTree = _llChild->_getFirstQuadTree();
@ -402,7 +402,7 @@ QuadTree* QuadTree::_getNextQuadTree(const Box& area)
// ************************************************** // **************************************************
{ {
QuadTree* nextQuadTree = NULL; QuadTree* nextQuadTree = NULL;
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (!nextQuadTree) nextQuadTree = _ulChild->_getFirstQuadTree(area); if (!nextQuadTree) nextQuadTree = _ulChild->_getFirstQuadTree(area);
if (!nextQuadTree) nextQuadTree = _urChild->_getFirstQuadTree(area); if (!nextQuadTree) nextQuadTree = _urChild->_getFirstQuadTree(area);
if (!nextQuadTree) nextQuadTree = _llChild->_getFirstQuadTree(area); if (!nextQuadTree) nextQuadTree = _llChild->_getFirstQuadTree(area);
@ -429,10 +429,10 @@ QuadTree* QuadTree::_getNextQuadTree(const Box& area)
return nextQuadTree; return nextQuadTree;
} }
void QuadTree::_Explode() void QuadTree::_explode()
// ********************** // **********************
{ {
if (!_HasBeenExploded()) { if (!_hasBeenExploded()) {
_x = getBoundingBox().getXCenter(); _x = getBoundingBox().getXCenter();
_y = getBoundingBox().getYCenter(); _y = getBoundingBox().getYCenter();
_ulChild = new QuadTree(this); _ulChild = new QuadTree(this);
@ -441,14 +441,14 @@ void QuadTree::_Explode()
_lrChild = new QuadTree(this); _lrChild = new QuadTree(this);
set<Go*> goSet; set<Go*> goSet;
for_each_go(go, _goSet.getElements()) { for_each_go(go, _goSet.getElements()) {
_goSet._Remove(go); _goSet._remove(go);
go->_quadTree = NULL; go->_quadTree = NULL;
goSet.insert(go); goSet.insert(go);
end_for; end_for;
} }
for_each_go(go, getCollection(goSet)) { for_each_go(go, getCollection(goSet)) {
QuadTree* child = _getDeepestChild(go->getBoundingBox()); QuadTree* child = _getDeepestChild(go->getBoundingBox());
child->_goSet._Insert(go); child->_goSet._insert(go);
go->_quadTree = child; go->_quadTree = child;
if (child != this) child->_size++; if (child != this) child->_size++;
end_for; end_for;
@ -456,41 +456,41 @@ void QuadTree::_Explode()
} }
} }
void QuadTree::_Implode() void QuadTree::_implode()
// ********************** // **********************
{ {
if (_HasBeenExploded()) { if (_hasBeenExploded()) {
if (_ulChild->_HasBeenExploded()) _ulChild->_Implode(); if (_ulChild->_hasBeenExploded()) _ulChild->_implode();
for_each_go(go, _ulChild->_goSet.getElements()) { for_each_go(go, _ulChild->_goSet.getElements()) {
_ulChild->_goSet._Remove(go); _ulChild->_goSet._remove(go);
_goSet._Insert(go); _goSet._insert(go);
go->_quadTree = this; go->_quadTree = this;
end_for; end_for;
} }
delete _ulChild; delete _ulChild;
_ulChild = NULL; _ulChild = NULL;
if (_urChild->_HasBeenExploded()) _urChild->_Implode(); if (_urChild->_hasBeenExploded()) _urChild->_implode();
for_each_go(go, _urChild->_goSet.getElements()) { for_each_go(go, _urChild->_goSet.getElements()) {
_urChild->_goSet._Remove(go); _urChild->_goSet._remove(go);
_goSet._Insert(go); _goSet._insert(go);
go->_quadTree = this; go->_quadTree = this;
end_for; end_for;
} }
delete _urChild; delete _urChild;
_urChild = NULL; _urChild = NULL;
if (_llChild->_HasBeenExploded()) _llChild->_Implode(); if (_llChild->_hasBeenExploded()) _llChild->_implode();
for_each_go(go, _llChild->_goSet.getElements()) { for_each_go(go, _llChild->_goSet.getElements()) {
_llChild->_goSet._Remove(go); _llChild->_goSet._remove(go);
_goSet._Insert(go); _goSet._insert(go);
go->_quadTree = this; go->_quadTree = this;
end_for; end_for;
} }
delete _llChild; delete _llChild;
_llChild = NULL; _llChild = NULL;
if (_lrChild->_HasBeenExploded()) _lrChild->_Implode(); if (_lrChild->_hasBeenExploded()) _lrChild->_implode();
for_each_go(go, _lrChild->_goSet.getElements()) { for_each_go(go, _lrChild->_goSet.getElements()) {
_lrChild->_goSet._Remove(go); _lrChild->_goSet._remove(go);
_goSet._Insert(go); _goSet._insert(go);
go->_quadTree = this; go->_quadTree = this;
end_for; end_for;
} }

12
hurricane/src/hurricane/QuadTree.h
View File

@ -79,13 +79,13 @@ class QuadTree {
// Predicates // Predicates
// ********** // **********
public: bool IsEmpty() const {return (_size == 0);}; public: bool isEmpty() const {return (_size == 0);};
// Updators // Updators
// ******** // ********
public: void Insert(Go* go); public: void insert(Go* go);
public: void Remove(Go* go); public: void remove(Go* go);
// Others // Others
// ****** // ******
@ -101,10 +101,10 @@ class QuadTree {
public: QuadTree* _getNextQuadTree(); public: QuadTree* _getNextQuadTree();
public: QuadTree* _getNextQuadTree(const Box& area); public: QuadTree* _getNextQuadTree(const Box& area);
public: bool _HasBeenExploded() const {return (_ulChild != NULL);}; public: bool _hasBeenExploded() const {return (_ulChild != NULL);};
public: void _Explode(); public: void _explode();
public: void _Implode(); public: void _implode();
}; };

10
hurricane/src/hurricane/Quark.cpp
View File

@ -56,10 +56,10 @@ void Quark::_postCreate()
SharedPath* sharedPath = _occurrence._getSharedPath(); SharedPath* sharedPath = _occurrence._getSharedPath();
if (sharedPath) if (sharedPath)
sharedPath->_getQuarkMap()._Insert(this); sharedPath->_getQuarkMap()._insert(this);
else { else {
if (!NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP = new Quark_QuarkMap(); if (!NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP = new Quark_QuarkMap();
NULL_SHARED_PATH_QUARK_MAP->_Insert(this); NULL_SHARED_PATH_QUARK_MAP->_insert(this);
} }
Inherit::_postCreate(); Inherit::_postCreate();
@ -76,9 +76,9 @@ void Quark::_preDestroy()
SharedPath* sharedPath = _occurrence._getSharedPath(); SharedPath* sharedPath = _occurrence._getSharedPath();
if (sharedPath) if (sharedPath)
sharedPath->_getQuarkMap()._Remove(this); sharedPath->_getQuarkMap()._remove(this);
else else
if (NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP->_Remove(this); if (NULL_SHARED_PATH_QUARK_MAP) NULL_SHARED_PATH_QUARK_MAP->_remove(this);
// trace << "exiting Quark::_preDestroy:" << endl; // trace << "exiting Quark::_preDestroy:" << endl;
// trace_out(); // trace_out();
@ -97,7 +97,7 @@ Record* Quark::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Occurrence", &_occurrence)); record->add(getSlot("Occurrence", &_occurrence));
} }
return record; return record;
} }

10
hurricane/src/hurricane/Record.cpp
View File

@ -31,7 +31,7 @@ Record::~Record()
} }
} }
Slot* Record::GetSlot(unsigned no) const Slot* Record::getSlot(unsigned no) const
// ************************************* // *************************************
{ {
SlotList::const_iterator iterator = _slotList.begin(); SlotList::const_iterator iterator = _slotList.begin();
@ -39,20 +39,20 @@ Slot* Record::GetSlot(unsigned no) const
return (iterator == _slotList.end()) ? NULL : *iterator; return (iterator == _slotList.end()) ? NULL : *iterator;
} }
void Record::Add(Slot* slot) void Record::add(Slot* slot)
// ************************* // *************************
{ {
if (!slot) { if (!slot) {
cerr << "[ERROR] Record::Add(): Attempt to add NULL Slot." << endl; cerr << "[ERROR] Record::add(): Attempt to add NULL Slot." << endl;
return; return;
} }
_slotList.push_back(slot); _slotList.push_back(slot);
} }
string Record::_GetString() const string Record::_getString() const
// ****************************** // ******************************
{ {
return "<" + _TName("Record") + " " + GetName() + ">"; return "<" + _TName("Record") + " " + getName() + ">";
} }

12
hurricane/src/hurricane/Record.h
View File

@ -73,18 +73,18 @@ namespace Hurricane {
// Accessors // Accessors
public: public:
const string& GetName () const { return _name; }; const string& getName () const { return _name; };
Slot* GetSlot ( unsigned no ) const; Slot* getSlot ( unsigned no ) const;
// Updators // Updators
public: public:
void Add ( Slot* slot ); void add ( Slot* slot );
// Others // Others
public: public:
string _GetTypeName () const { return _TName("Record"); }; string _getTypeName () const { return _TName("Record"); };
string _GetString () const; string _getString () const;
SlotList& _GetSlotList () { return _slotList; }; SlotList& _getSlotList () { return _slotList; };
}; };

4
hurricane/src/hurricane/Reference.cpp
View File

@ -81,8 +81,8 @@ Record* Reference::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("point", &_point)); record->add(getSlot("point", &_point));
} }
return record; return record;
} }

28
hurricane/src/hurricane/Region.cpp
View File

@ -945,12 +945,12 @@ Record* Region_Tile::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("BoundingBox", &_boundingBox)); record->add(getSlot("BoundingBox", &_boundingBox));
record->Add(getSlot("IsVoid", &_isVoid)); record->add(getSlot("IsVoid", &_isVoid));
record->Add(getSlot("LeftTile", _leftTile)); record->add(getSlot("LeftTile", _leftTile));
record->Add(getSlot("BottomTile", _bottomTile)); record->add(getSlot("BottomTile", _bottomTile));
record->Add(getSlot("TopTile", _topTile)); record->add(getSlot("TopTile", _topTile));
record->Add(getSlot("RightTile", _rightTile)); record->add(getSlot("RightTile", _rightTile));
} }
return record; return record;
} }
@ -2190,7 +2190,7 @@ Record* Region::SwapLine::Type::_getRecord() const
// ***************************************** // *****************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add ( getSlot ( "Code", ((unsigned int*)((void*)&_code)) ) ); record->add ( getSlot ( "Code", ((unsigned int*)((void*)&_code)) ) );
return record; return record;
} }
@ -2409,11 +2409,11 @@ Record* Region::SwapLine::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("Region", _region)); record->add(getSlot("Region", _region));
record->Add(getSlot("Type", &_type)); record->add(getSlot("Type", &_type));
record->Add(getSlot("Position", &_position)); record->add(getSlot("Position", &_position));
record->Add(getSlot("Extention", &_extention)); record->add(getSlot("Extention", &_extention));
record->Add(getSlot("BaseTile", _baseTile)); record->add(getSlot("BaseTile", _baseTile));
} }
return record; return record;
} }
@ -2784,8 +2784,8 @@ Record* Region::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("BottomRightTile", _bottomRightTile)); record->add(getSlot("BottomRightTile", _bottomRightTile));
record->Add(getSlot("TopLeftTile", _topLeftTile)); record->add(getSlot("TopLeftTile", _topLeftTile));
} }
return record; return record;
} }

4
hurricane/src/hurricane/Relation.cpp
View File

@ -110,7 +110,7 @@ Record* Relation::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("MasterOwner", _masterOwner)); record->add(getSlot("MasterOwner", _masterOwner));
} }
return record; return record;
} }
@ -149,7 +149,7 @@ Record* StandardRelation::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
} }
return record; return record;
} }

42
hurricane/src/hurricane/RoutingPad.cpp
View File

@ -185,31 +185,31 @@ void RoutingPad::translate(const Unit& dx, const Unit& dy)
} }
} }
void RoutingPad::SetX(const Unit& x) void RoutingPad::setX(const Unit& x)
// ****************************** // ******************************
{ {
SetPosition(x, getY()); setPosition(x, getY());
} }
void RoutingPad::SetY(const Unit& y) void RoutingPad::setY(const Unit& y)
// ****************************** // ******************************
{ {
SetPosition(getX(), y); setPosition(getX(), y);
} }
void RoutingPad::SetPosition(const Unit& x, const Unit& y) void RoutingPad::setPosition(const Unit& x, const Unit& y)
// **************************************************** // ****************************************************
{ {
SetOffset(x, y); setOffset(x, y);
} }
void RoutingPad::SetPosition(const Point& position) void RoutingPad::setPosition(const Point& position)
// ********************************************* // *********************************************
{ {
SetPosition(position.getX(), position.getY()); setPosition(position.getX(), position.getY());
} }
void RoutingPad::SetOffset(const Unit& x, const Unit& y) void RoutingPad::setOffset(const Unit& x, const Unit& y)
// **************************************************** // ****************************************************
{ {
invalidate(true); invalidate(true);
@ -248,9 +248,9 @@ Record* RoutingPad::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("X", &_x)); record->add(getSlot("X", &_x));
record->Add(getSlot("Y", &_y)); record->add(getSlot("Y", &_y));
record->Add(getSlot("Occurrence",_occurrence)); record->add(getSlot("Occurrence",_occurrence));
} }
return record; return record;
} }
@ -273,7 +273,7 @@ Segment* RoutingPad::_getEntityAsSegment () const
return NULL; return NULL;
} }
void RoutingPad::SetExternalComponent(Component* component) void RoutingPad::setExternalComponent(Component* component)
// ******************************************************** // ********************************************************
{ {
if (isMaterialized()) invalidate(false); if (isMaterialized()) invalidate(false);
@ -290,15 +290,15 @@ void RoutingPad::SetExternalComponent(Component* component)
Horizontal* horizontal = dynamic_cast<Horizontal*>(component); Horizontal* horizontal = dynamic_cast<Horizontal*>(component);
if ( horizontal ) { if ( horizontal ) {
SetX ( 0 ); setX ( 0 );
SetY ( position.getY() ); setY ( position.getY() );
} else { } else {
Vertical* vertical = dynamic_cast<Vertical*>(component); Vertical* vertical = dynamic_cast<Vertical*>(component);
if ( vertical ) { if ( vertical ) {
SetX ( position.getX() ); setX ( position.getX() );
SetY ( 0 ); setY ( 0 );
} else } else
SetPosition ( position ); setPosition ( position );
} }
_occurrence.getMasterCell()->_addSlaveEntity(_occurrence.getEntity(),this); _occurrence.getMasterCell()->_addSlaveEntity(_occurrence.getEntity(),this);
@ -325,13 +325,13 @@ Occurrence RoutingPad::getPlugOccurrence()
} }
void RoutingPad::RestorePlugOccurrence() void RoutingPad::restorePlugOccurrence()
// ************************************* // *************************************
{ {
if (isMaterialized()) unmaterialize(); if (isMaterialized()) unmaterialize();
_occurrence=getPlugOccurrence(); _occurrence=getPlugOccurrence();
SetPosition ( _occurrence.getPath().getTransformation().getPoint setPosition ( _occurrence.getPath().getTransformation().getPoint
( dynamic_cast<Component*>(_occurrence.getEntity())->getPosition() ) ); ( dynamic_cast<Component*>(_occurrence.getEntity())->getPosition() ) );
} }
@ -358,7 +358,7 @@ RoutingPad* createRoutingPad ( Net* net, Occurrence plugOccurrence )
} }
RoutingPad* rp = RoutingPad::create ( net, plugOccurrence ); RoutingPad* rp = RoutingPad::create ( net, plugOccurrence );
rp->SetExternalComponent ( bestComponent ); rp->setExternalComponent ( bestComponent );
return rp; return rp;
} }

14
hurricane/src/hurricane/RoutingPad.h
View File

@ -73,13 +73,13 @@ class RoutingPad : public Component {
public: virtual void translate(const Unit& dx, const Unit& dy); public: virtual void translate(const Unit& dx, const Unit& dy);
public: void SetX(const Unit& x); public: void setX(const Unit& x);
public: void SetY(const Unit& y); public: void setY(const Unit& y);
public: void SetPosition(const Unit& x, const Unit& y); public: void setPosition(const Unit& x, const Unit& y);
public: void SetPosition(const Point& position); public: void setPosition(const Point& position);
public: void SetOffset(const Unit& x, const Unit& y); public: void setOffset(const Unit& x, const Unit& y);
public: void SetExternalComponent(Component* component); public: void setExternalComponent(Component* component);
public: void RestorePlugOccurrence(); public: void restorePlugOccurrence();
// Others // Others
// ****** // ******

24
hurricane/src/hurricane/Rubber.cpp
View File

@ -102,7 +102,7 @@ void Rubber::materialize()
if (!isMaterialized()) { if (!isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
QuadTree* quadTree = cell->_getQuadTree(); QuadTree* quadTree = cell->_getQuadTree();
quadTree->Insert(this); quadTree->insert(this);
cell->_fit(quadTree->getBoundingBox()); cell->_fit(quadTree->getBoundingBox());
} }
} }
@ -113,7 +113,7 @@ void Rubber::unmaterialize()
if (isMaterialized()) { if (isMaterialized()) {
Cell* cell = getCell(); Cell* cell = getCell();
cell->_unfit(getBoundingBox()); cell->_unfit(getBoundingBox());
cell->_getQuadTree()->Remove(this); cell->_getQuadTree()->remove(this);
} }
} }
@ -146,7 +146,7 @@ Rubber* Rubber::_create(Hook* hook)
void Rubber::_postCreate() void Rubber::_postCreate()
// *********************** // ***********************
{ {
_net->_getRubberSet()._Insert(this); _net->_getRubberSet()._insert(this);
for_each_hook(hook, getHooks()) { for_each_hook(hook, getHooks()) {
hook->getComponent()->_setRubber(this); hook->getComponent()->_setRubber(this);
@ -179,7 +179,7 @@ void Rubber::_preDestroy()
end_for; end_for;
} }
_net->_getRubberSet()._Remove(this); _net->_getRubberSet()._remove(this);
// trace << "exiting Rubber::_preDestroy:" << endl; // trace << "exiting Rubber::_preDestroy:" << endl;
// trace_out(); // trace_out();
@ -199,10 +199,10 @@ Record* Rubber::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("Net", _net)); record->add(getSlot("Net", _net));
record->Add(getSlot("Hook", _hook)); record->add(getSlot("Hook", _hook));
record->Add(getSlot("Count", _count)); record->add(getSlot("Count", _count));
record->Add(getSlot("BoundingBox", _boundingBox)); record->add(getSlot("BoundingBox", _boundingBox));
} }
return record; return record;
} }
@ -211,9 +211,9 @@ void Rubber::_setNet(Net* net)
// *************************** // ***************************
{ {
if (net != _net) { if (net != _net) {
if (_net) _net->_getRubberSet()._Remove(this); if (_net) _net->_getRubberSet()._remove(this);
_net = net; _net = net;
if (_net) _net->_getRubberSet()._Insert(this); if (_net) _net->_getRubberSet()._insert(this);
} }
} }
@ -225,14 +225,14 @@ void Rubber::_setHook(Hook* hook)
_hook = hook; _hook = hook;
} }
void Rubber::_Capture() void Rubber::_capture()
// ******************** // ********************
{ {
invalidate(); invalidate();
_count++; _count++;
} }
void Rubber::_Release() void Rubber::_release()
// ******************** // ********************
{ {
if (_count != ((unsigned)-1)) { // not in deletion if (_count != ((unsigned)-1)) { // not in deletion

4
hurricane/src/hurricane/Rubber.h
View File

@ -87,8 +87,8 @@ class Rubber : public Go {
public: void _setHook(Hook* hook); public: void _setHook(Hook* hook);
public: void _setNextOfNetRubberSet(Rubber* rubber) {_nextOfNetRubberSet = rubber;}; public: void _setNextOfNetRubberSet(Rubber* rubber) {_nextOfNetRubberSet = rubber;};
public: void _Capture(); public: void _capture();
public: void _Release(); public: void _release();
}; };

12
hurricane/src/hurricane/Segment.cpp
View File

@ -306,12 +306,12 @@ Record* Segment::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("SourceHook", &_sourceHook)); record->add(getSlot("SourceHook", &_sourceHook));
record->Add(getSlot("Source", getSource())); record->add(getSlot("Source", getSource()));
record->Add(getSlot("TargetHook", &_targetHook)); record->add(getSlot("TargetHook", &_targetHook));
record->Add(getSlot("Target", getTarget())); record->add(getSlot("Target", getTarget()));
record->Add(getSlot("Layer", _layer)); record->add(getSlot("Layer", _layer));
record->Add(getSlot("Width", &_width)); record->add(getSlot("Width", &_width));
} }
return record; return record;
} }

2
hurricane/src/hurricane/SetCollection.h
View File

@ -169,7 +169,7 @@ template<class Element, class Compare = less<Element> >
unsigned n = 1; unsigned n = 1;
typename set<Element, Compare>::const_iterator iterator = _elementSet->begin(); // AD typename set<Element, Compare>::const_iterator iterator = _elementSet->begin(); // AD
while (iterator != _elementSet->end()) { while (iterator != _elementSet->end()) {
record->Add(getSlot(getString(n++), *iterator)); record->add(getSlot(getString(n++), *iterator));
++iterator; ++iterator;
} }
} }

8
hurricane/src/hurricane/SharedName.cpp
View File

@ -31,13 +31,13 @@ SharedName::~SharedName()
_SHARED_NAME_MAP->erase(&_string); _SHARED_NAME_MAP->erase(&_string);
} }
void SharedName::Capture() void SharedName::capture()
// *********************** // ***********************
{ {
_count++; _count++;
} }
void SharedName::Release() void SharedName::release()
// *********************** // ***********************
{ {
if (!--_count) delete this; if (!--_count) delete this;
@ -53,8 +53,8 @@ Record* SharedName::_getRecord() const
// ***************************** // *****************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Count", &_count)); record->add(getSlot("Count", &_count));
record->Add(getSlot("String", &_string)); record->add(getSlot("String", &_string));
return record; return record;
} }

4
hurricane/src/hurricane/SharedName.h
View File

@ -67,8 +67,8 @@ class SharedName {
// Updators // Updators
// ******** // ********
private: void Capture(); private: void capture();
private: void Release(); private: void release();
// Others // Others
// ****** // ******

10
hurricane/src/hurricane/SharedPath.cpp
View File

@ -100,7 +100,7 @@ SharedPath::SharedPath(Instance* headInstance, SharedPath* tailSharedPath)
if (_tailSharedPath && (_tailSharedPath->getOwnerCell() != _headInstance->getMasterCell())) if (_tailSharedPath && (_tailSharedPath->getOwnerCell() != _headInstance->getMasterCell()))
throw Error("Can't create " + _TName("SharedPath") + " : incompatible tail path"); throw Error("Can't create " + _TName("SharedPath") + " : incompatible tail path");
_headInstance->_getSharedPathMap()._Insert(this); _headInstance->_getSharedPathMap()._insert(this);
} }
SharedPath::~SharedPath() SharedPath::~SharedPath()
@ -114,7 +114,7 @@ SharedPath::~SharedPath()
if (sharedPath) delete sharedPath; if (sharedPath) delete sharedPath;
end_for; end_for;
} }
_headInstance->_getSharedPathMap()._Remove(this); _headInstance->_getSharedPathMap()._remove(this);
} }
SharedPath* SharedPath::getHeadSharedPath() const SharedPath* SharedPath::getHeadSharedPath() const
@ -211,9 +211,9 @@ Record* SharedPath::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("HeadInstance", _headInstance)); record->add(getSlot("HeadInstance", _headInstance));
record->Add(getSlot("TailSharedPath", _tailSharedPath)); record->add(getSlot("TailSharedPath", _tailSharedPath));
record->Add(getSlot("Quarks", &_quarkMap)); record->add(getSlot("Quarks", &_quarkMap));
} }
return record; return record;
} }

10
hurricane/src/hurricane/Slice.cpp
View File

@ -35,13 +35,13 @@ Slice::Slice(Cell* cell, Layer* layer)
if (_cell->getSlice(_layer)) if (_cell->getSlice(_layer))
throw Error("Can't create " + _TName("Slice") + " : already exists"); throw Error("Can't create " + _TName("Slice") + " : already exists");
_cell->_getSliceMap()._Insert(this); _cell->_getSliceMap()._insert(this);
} }
Slice::~Slice() Slice::~Slice()
// ************ // ************
{ {
_cell->_getSliceMap()._Remove(this); _cell->_getSliceMap()._remove(this);
} }
Components Slice::getComponents() const Components Slice::getComponents() const
@ -101,9 +101,9 @@ Record* Slice::_getRecord() const
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
if (record) { if (record) {
record->Add(getSlot("Cell", _cell)); record->add(getSlot("Cell", _cell));
record->Add(getSlot("Layer", _layer)); record->add(getSlot("Layer", _layer));
record->Add(getSlot("QuadTree", &_quadTree)); record->add(getSlot("QuadTree", &_quadTree));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Slice.h
View File

@ -68,7 +68,7 @@ class Slice {
// Predicates // Predicates
// ********** // **********
public: bool IsEmpty() const {return _quadTree.IsEmpty();}; public: bool isEmpty() const {return _quadTree.isEmpty();};
// Others // Others
// ****** // ******

10
hurricane/src/hurricane/SlotAdapter.h
View File

@ -666,7 +666,7 @@ template<typename Element>
unsigned n = 1; unsigned n = 1;
typename vector<Element>::const_iterator iterator = _v->begin(); typename vector<Element>::const_iterator iterator = _v->begin();
while ( iterator != _v->end() ) { while ( iterator != _v->end() ) {
record->Add ( getSlot(getString(n++), *iterator) ); record->add ( getSlot(getString(n++), *iterator) );
++iterator; ++iterator;
} }
} }
@ -719,7 +719,7 @@ template<typename Element>
unsigned n = 1; unsigned n = 1;
typename list<Element>::const_iterator iterator = _l->begin(); typename list<Element>::const_iterator iterator = _l->begin();
while ( iterator != _l->end() ) { while ( iterator != _l->end() ) {
record->Add ( getSlot(getString(n++), *iterator) ); record->add ( getSlot(getString(n++), *iterator) );
++iterator; ++iterator;
} }
} }
@ -769,7 +769,7 @@ template<typename Key, typename Element, typename Compare>
record = new Record ( "map<Element>" ); record = new Record ( "map<Element>" );
typename map<Key,Element,Compare>::const_iterator iterator = _m->begin(); typename map<Key,Element,Compare>::const_iterator iterator = _m->begin();
while ( iterator != _m->end() ) { while ( iterator != _m->end() ) {
record->Add ( getSlot(getString(iterator->first), iterator->second) ); record->add ( getSlot(getString(iterator->first), iterator->second) );
++iterator; ++iterator;
} }
} }
@ -820,7 +820,7 @@ template<typename Element, typename Compare>
unsigned n = 1; unsigned n = 1;
typename set<Element,Compare>::const_iterator iterator = _s->begin(); typename set<Element,Compare>::const_iterator iterator = _s->begin();
while ( iterator != _s->end() ) { while ( iterator != _s->end() ) {
record->Add ( getSlot(getString(n++), *iterator) ); record->add ( getSlot(getString(n++), *iterator) );
++iterator; ++iterator;
} }
} }
@ -871,7 +871,7 @@ template<typename Element, typename Compare>
unsigned n = 1; unsigned n = 1;
typename multiset<Element,Compare>::const_iterator iterator = _s->begin(); typename multiset<Element,Compare>::const_iterator iterator = _s->begin();
while ( iterator != _s->end() ) { while ( iterator != _s->end() ) {
record->Add ( getSlot(getString(n++), *iterator) ); record->add ( getSlot(getString(n++), *iterator) );
++iterator; ++iterator;
} }
} }

8
hurricane/src/hurricane/Technology.cpp
View File

@ -152,7 +152,7 @@ CompositeLayers Technology::getCompositeLayers() const
return SubTypeCollection<Layer*, CompositeLayer*>(getLayers()); return SubTypeCollection<Layer*, CompositeLayer*>(getLayers());
} }
void Technology::SetName(const Name& name) void Technology::setName(const Name& name)
// *************************************** // ***************************************
{ {
if (name != _name) { if (name != _name) {
@ -194,9 +194,9 @@ Record* Technology::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("DataBase", _dataBase)); record->add(getSlot("DataBase", _dataBase));
record->Add(getSlot("Name", &_name)); record->add(getSlot("Name", &_name));
record->Add(getSlot("Layers", &_layerList)); record->add(getSlot("Layers", &_layerList));
} }
return record; return record;
} }

2
hurricane/src/hurricane/Technology.h
View File

@ -80,7 +80,7 @@ class Technology : public DBo {
// Updators // Updators
// ******** // ********
public: void SetName(const Name& name); public: void setName(const Name& name);
// Others // Others
// ****** // ******

2
hurricane/src/hurricane/Timer.cpp
View File

@ -72,7 +72,7 @@ Record* Timer::_getRecord() const
// ************************ // ************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Time", &_time)); record->add(getSlot("Time", &_time));
return record; return record;
} }

8
hurricane/src/hurricane/Transformation.cpp
View File

@ -236,9 +236,9 @@ Record* Transformation::_getRecord() const
// ********************************* // *********************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("X", &_tx)); record->add(getSlot("X", &_tx));
record->Add(getSlot("Y", &_ty)); record->add(getSlot("Y", &_ty));
record->Add(getSlot("Orientation", _orientation)); record->add(getSlot("Orientation", _orientation));
return record; return record;
} }
@ -277,7 +277,7 @@ Record* Transformation::Orientation::_getRecord() const
// ********************************************** // **********************************************
{ {
Record* record = new Record(getString(this)); Record* record = new Record(getString(this));
record->Add(getSlot("Code", &_code)); record->add(getSlot("Code", &_code));
return record; return record;
} }

2
hurricane/src/hurricane/Transformation.h
View File

@ -158,7 +158,7 @@ template<>
( const Transformation::Orientation::Code* object ) ( const Transformation::Orientation::Code* object )
{ {
Record* record = new Record(getString(object)); Record* record = new Record(getString(object));
record->Add(getSlot("Code", (unsigned int*)object)); record->add(getSlot("Code", (unsigned int*)object));
return record; return record;
} }

8
hurricane/src/hurricane/Unit.cpp
View File

@ -42,7 +42,7 @@ unsigned getMaximalPrecisionAllowed()
return MAXIMAL_PRECISION_ALLOWED; return MAXIMAL_PRECISION_ALLOWED;
} }
void SetPrecision(unsigned precision) void setPrecision(unsigned precision)
// ********************************** // **********************************
{ {
if (MAXIMAL_PRECISION_ALLOWED < precision) if (MAXIMAL_PRECISION_ALLOWED < precision)
@ -53,7 +53,7 @@ void SetPrecision(unsigned precision)
RESOLUTION = 1; RESOLUTION = 1;
while (precision--) RESOLUTION /= 10; while (precision--) RESOLUTION /= 10;
SetGridStep(getUnit(1)); setGridStep(getUnit(1));
} }
@ -80,7 +80,7 @@ const Unit& getGridStep()
return GRID_STEP; return GRID_STEP;
} }
void SetGridStep(const Unit& gridStep) void setGridStep(const Unit& gridStep)
// *********************************** // ***********************************
{ {
if (!gridStep) throw Error("Can't set grid step : invalid value"); if (!gridStep) throw Error("Can't set grid step : invalid value");
@ -88,7 +88,7 @@ void SetGridStep(const Unit& gridStep)
GRID_STEP = gridStep; GRID_STEP = gridStep;
} }
bool IsOnGrid(const Unit& unit, int n) bool isOnGrid(const Unit& unit, int n)
// *********************************** // ***********************************
{ {
if (n <= 0) throw Error("Can't compute : invalid value"); if (n <= 0) throw Error("Can't compute : invalid value");

6
hurricane/src/hurricane/Unit.h
View File

@ -32,7 +32,7 @@ unsigned getPrecision();
unsigned getMaximalPrecisionAllowed(); unsigned getMaximalPrecisionAllowed();
void SetPrecision(unsigned precision); void setPrecision(unsigned precision);
// Should be called only once at the beginning of the program // Should be called only once at the beginning of the program
@ -51,9 +51,9 @@ double getResolution();
const Unit& getGridStep(); const Unit& getGridStep();
void SetGridStep(const Unit& gridStep); void setGridStep(const Unit& gridStep);
bool IsOnGrid(const Unit& unit, int n = 1); bool isOnGrid(const Unit& unit, int n = 1);
Unit getOnGridUnit(const Unit& unit, int s = 0); Unit getOnGridUnit(const Unit& unit, int s = 0);

4
hurricane/src/hurricane/UpdateSession.cpp
View File

@ -157,7 +157,7 @@ void Go::invalidate(bool propagateFlag)
// Generic functions // Generic functions
// **************************************************************************************************** // ****************************************************************************************************
void OpenUpdateSession() void openUpdateSession()
// ********************* // *********************
{ {
// trace << "OpenUpdateSession()" << endl; // trace << "OpenUpdateSession()" << endl;
@ -165,7 +165,7 @@ void OpenUpdateSession()
UpdateSession::_create(); UpdateSession::_create();
} }
void CloseUpdateSession() void closeUpdateSession()
// ********************** // **********************
{ {
// trace << "CloseUpdateSession()" << endl; // trace << "CloseUpdateSession()" << endl;

4
hurricane/src/hurricane/UpdateSession.h
View File

@ -66,9 +66,9 @@ class UpdateSession : public SharedProperty {
// Generic functions // Generic functions
// **************************************************************************************************** // ****************************************************************************************************
void OpenUpdateSession(); void openUpdateSession();
void CloseUpdateSession(); void closeUpdateSession();

6
hurricane/src/hurricane/UserGo.cpp
View File

@ -100,7 +100,7 @@ void UserGo::materialize()
{ {
if (!isMaterialized()) { if (!isMaterialized()) {
QuadTree& quadTree = _displaySlot->_getQuadTree(); QuadTree& quadTree = _displaySlot->_getQuadTree();
quadTree.Insert(this); quadTree.insert(this);
getCell()->_fit(quadTree.getBoundingBox()); getCell()->_fit(quadTree.getBoundingBox());
} }
} }
@ -111,7 +111,7 @@ void UserGo::unmaterialize()
if (isMaterialized()) { if (isMaterialized()) {
QuadTree& quadTree = _displaySlot->_getQuadTree(); QuadTree& quadTree = _displaySlot->_getQuadTree();
getCell()->_unfit(getBoundingBox()); getCell()->_unfit(getBoundingBox());
quadTree.Remove(this); quadTree.remove(this);
} }
} }
@ -128,7 +128,7 @@ Record* UserGo::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("DisplaySlot", _displaySlot)); record->add(getSlot("DisplaySlot", _displaySlot));
} }
return record; return record;
} }

2
hurricane/src/hurricane/VectorCollection.h
View File

@ -163,7 +163,7 @@ template<class Element> class VectorCollection : public Collection<Element> {
unsigned n = 1; unsigned n = 1;
typename vector<Element>::const_iterator iterator = _elementVector->begin(); // AD typename vector<Element>::const_iterator iterator = _elementVector->begin(); // AD
while (iterator != _elementVector->end()) { while (iterator != _elementVector->end()) {
record->Add(getSlot(getString(n++), *iterator)); record->add(getSlot(getString(n++), *iterator));
++iterator; ++iterator;
} }
} }

6
hurricane/src/hurricane/Vertical.cpp
View File

@ -160,9 +160,9 @@ Record* Vertical::_getRecord() const
{ {
Record* record = Inherit::_getRecord(); Record* record = Inherit::_getRecord();
if (record) { if (record) {
record->Add(getSlot("X", &_x)); record->add(getSlot("X", &_x));
record->Add(getSlot("DySource", &_dySource)); record->add(getSlot("DySource", &_dySource));
record->Add(getSlot("DyTarget", &_dyTarget)); record->add(getSlot("DyTarget", &_dyTarget));
} }
return record; return record;
} }

4
hurricane/src/pyext/ProxyProperty.cpp
View File

@ -227,8 +227,8 @@ Record* ProxyProperty::_getRecord () const
Record* record = Property::_getRecord (); Record* record = Property::_getRecord ();
if ( record != NULL ) { if ( record != NULL ) {
record->Add ( getSlot ( "_owner" , _owner ) ); record->add ( getSlot ( "_owner" , _owner ) );
record->Add ( getSlot ( "_shadow", _shadow ) ); record->add ( getSlot ( "_shadow", _shadow ) );
} }
return ( record ); return ( record );

4
hurricane/src/pyext/PyHurricane.cpp
View File

@ -526,8 +526,8 @@ extern "C" {
{ { "getUnit" , PyUnit_getUnit , METH_VARARGS, "Convert to Unit." } { { "getUnit" , PyUnit_getUnit , METH_VARARGS, "Convert to Unit." }
, { "getValue" , PyUnit_getValue , METH_VARARGS, "Convert a Unit to a value." } , { "getValue" , PyUnit_getValue , METH_VARARGS, "Convert a Unit to a value." }
, { "getDataBase" , (PyCFunction)PyDataBase_getDataBase , METH_NOARGS , "Get the current DataBase." } , { "getDataBase" , (PyCFunction)PyDataBase_getDataBase , METH_NOARGS , "Get the current DataBase." }
, { "OpenUpdateSession" , (PyCFunction)PyUpdateSession_OpenUpdateSession , METH_NOARGS , "Open an UpdateSession." } , { "openUpdateSession" , (PyCFunction)PyUpdateSession_openUpdateSession , METH_NOARGS , "Open an UpdateSession." }
, { "CloseUpdateSession" , (PyCFunction)PyUpdateSession_CloseUpdateSession, METH_NOARGS , "Close an UpdateSession." } , { "closeUpdateSession" , (PyCFunction)PyUpdateSession_closeUpdateSession, METH_NOARGS , "Close an UpdateSession." }
, { "getExternalComponents" , (PyCFunction)PyNetExternalComponents_getExternalComponents, METH_VARARGS, "Returns the components collection of an external net" } , { "getExternalComponents" , (PyCFunction)PyNetExternalComponents_getExternalComponents, METH_VARARGS, "Returns the components collection of an external net" }
, {NULL, NULL, 0, NULL} /* sentinel */ , {NULL, NULL, 0, NULL} /* sentinel */
}; };

15
hurricane/src/pyext/PyTechnology.cpp
View File

@ -103,19 +103,18 @@ extern "C" {
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Attribute Method : "PyTechnology_SetName ()" // Attribute Method : "PyTechnology_setName ()"
static PyObject* PyTechnology_SetName ( PyTechnology *self, PyObject* args ) static PyObject* PyTechnology_setName ( PyTechnology *self, PyObject* args ) {
{ trace << "Technology.setName()" << endl;
trace << "Technology.SetName()" << endl; METHOD_HEAD ( "Technology.setName()" )
METHOD_HEAD ( "Technology.SetName()" )
HTRY HTRY
PyName* name; PyName* name;
if ( ! ParseOneArg ( "Technology.SetName", args, NAME_ARG, (PyObject**)&name ) ) return ( NULL ); if ( ! ParseOneArg ( "Technology.setName", args, NAME_ARG, (PyObject**)&name ) ) return ( NULL );
techno->SetName ( *PYNAME_O(name) ); techno->setName ( *PYNAME_O(name) );
HCATCH HCATCH
Py_RETURN_NONE; Py_RETURN_NONE;
@ -159,7 +158,7 @@ extern "C" {
PyMethodDef PyTechnology_Methods[] = PyMethodDef PyTechnology_Methods[] =
{ { "getName" , (PyCFunction)PyTechnology_getName , METH_NOARGS , "Returns the name of the technology." } { { "getName" , (PyCFunction)PyTechnology_getName , METH_NOARGS , "Returns the name of the technology." }
, { "SetName" , (PyCFunction)PyTechnology_SetName , METH_VARARGS, "Allows to change the technology name." } , { "setName" , (PyCFunction)PyTechnology_setName , METH_VARARGS, "Allows to change the technology name." }
, { "getLayer" , (PyCFunction)PyTechnology_getLayer , METH_VARARGS, "Returns the layer named name." } , { "getLayer" , (PyCFunction)PyTechnology_getLayer , METH_VARARGS, "Returns the layer named name." }
, { "destroy" , (PyCFunction)PyTechnology_destroy , METH_NOARGS , { "destroy" , (PyCFunction)PyTechnology_destroy , METH_NOARGS
, "Destroy associated hurricane object The python object remains." } , "Destroy associated hurricane object The python object remains." }

17
hurricane/src/pyext/PyUpdateSession.cpp
View File

@ -72,14 +72,13 @@ extern "C" {
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Attribute Method : "PyUpdateSession_OpenUpdateSession ()" // Attribute Method : "PyUpdateSession_openUpdateSession ()"
extern PyObject* PyUpdateSession_OpenUpdateSession ( PyObject* module ) extern PyObject* PyUpdateSession_openUpdateSession ( PyObject* module ) {
{ trace << "PyUpdateSession_openUpdateSession ()" << endl;
trace << "PyUpdateSession_OpenUpdateSession ()" << endl;
HTRY HTRY
OpenUpdateSession (); openUpdateSession ();
HCATCH HCATCH
Py_RETURN_NONE; Py_RETURN_NONE;
@ -89,14 +88,14 @@ extern "C" {
// --------------------------------------------------------------- // ---------------------------------------------------------------
// Attribute Method : "PyUpdateSession_CloseUpdateSession ()" // Attribute Method : "PyUpdateSession_closeUpdateSession ()"
extern PyObject* PyUpdateSession_CloseUpdateSession ( PyObject* module ) extern PyObject* PyUpdateSession_closeUpdateSession ( PyObject* module )
{ {
trace << "PyUpdateSession_CloseUpdateSession ()" << endl; trace << "PyUpdateSession_closeUpdateSession ()" << endl;
HTRY HTRY
CloseUpdateSession (); closeUpdateSession ();
HCATCH HCATCH
Py_RETURN_NONE; Py_RETURN_NONE;

14
hurricane/src/pyext/PyUpdateSession.h
View File

@ -53,13 +53,13 @@
# ifndef __PYUPDATESESSION__ #ifndef __PYUPDATESESSION__
# define __PYUPDATESESSION__ #define __PYUPDATESESSION__
# include "PyHurricane.h" #include "PyHurricane.h"
# include "UpdateSession.h" #include "UpdateSession.h"
namespace Isobar { namespace Isobar {
@ -77,8 +77,8 @@ extern "C" {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Functions & Types exported to "PyHurricane.ccp". // Functions & Types exported to "PyHurricane.ccp".
extern PyObject* PyUpdateSession_OpenUpdateSession ( PyObject* module ); extern PyObject* PyUpdateSession_openUpdateSession ( PyObject* module );
extern PyObject* PyUpdateSession_CloseUpdateSession ( PyObject* module ); extern PyObject* PyUpdateSession_closeUpdateSession ( PyObject* module );
} // End of extern "C". } // End of extern "C".
@ -91,4 +91,4 @@ extern "C" {
# endif #endif