jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Anabatic from cgt. Index numbering in vector slot. 

* Bug: In Unicorn, in cgt.py, do not import Anabatic as it is not present
    yet in the devel branch.
* Change: In Hurricane, in Commons.h, in the vector slot template, start
    index at 0 and not 1 (to closer to the internal representation).
* Change: In ExtensionGo, forgotten trace system calls to update.
This commit is contained in:
Jean-Paul Chaput 2016-05-23 16:02:57 +02:00
parent 6fd38e9847
commit f11be897ef
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hurricane/src/hurricane/ExtensionGo.cpp
View File

@ -57,15 +57,15 @@ namespace Hurricane {
void ExtensionGo::materialize () void ExtensionGo::materialize ()
{ {
if ( !isMaterialized() ) { if (not isMaterialized()) {
if ( _cell ) { if (_cell) {
ExtensionSlice* slice = _cell->getExtensionSlice ( getName() ); ExtensionSlice* slice = _cell->getExtensionSlice( getName() );
if ( !slice ) slice = ExtensionSlice::_create ( _cell, getName() ); if (not slice) slice = ExtensionSlice::_create( _cell, getName() );
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("%s not inserted into QuadTree.",getString(this).c_str()) << endl; cerr << Warning( "%s not inserted into QuadTree.", getString(this).c_str() ) << endl;
} }
} }
} }
@ -73,20 +73,19 @@ namespace Hurricane {
void ExtensionGo::unmaterialize () void ExtensionGo::unmaterialize ()
{ {
//ltrace(9) << "ExtensionGo::unmaterialize() - " << (void*)this << endl; cdebug.log(18,1) << "ExtensionGo::unmaterialize() - start" << (void*)this << endl;
//ltracein(9);
if ( isMaterialized() ) { if ( isMaterialized() ) {
ExtensionSlice* slice = _cell->getExtensionSlice ( getName() ); ExtensionSlice* slice = _cell->getExtensionSlice( getName() );
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();
} }
} }
//ltrace(9) << "ExtensionGo::unmaterialize() - exit" << endl; cdebug.tabw(18,-1);
//ltraceout(9); cdebug.log(18) << "ExtensionGo::unmaterialize() - completed" << endl;
} }
@ -105,7 +104,7 @@ namespace Hurricane {
string ExtensionGo::_getString () const string ExtensionGo::_getString () const
{ {
string s = Go::_getString(); string s = Go::_getString();
s.insert ( s.length() - 1, " " + getString(getName()) ); //s.insert ( s.length() - 1, " " + getString(getName()) );
return s; return s;
} }

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

@ -302,7 +302,7 @@ inline Hurricane::Record* getRecord ( std::vector<Element>* v )
Hurricane::Record* record = NULL; Hurricane::Record* record = NULL;
if ( !v->empty() ) { if ( !v->empty() ) {
record = new Hurricane::Record ( "std::vector<Element>" ); record = new Hurricane::Record ( "std::vector<Element>" );
unsigned n = 1; unsigned n = 0;
typename std::vector<Element>::iterator iterator = v->begin(); typename std::vector<Element>::iterator iterator = v->begin();
while ( iterator != v->end() ) { while ( iterator != v->end() ) {
record->add ( getSlot<Element>(getString(n++), *iterator) ); record->add ( getSlot<Element>(getString(n++), *iterator) );
@ -327,7 +327,7 @@ inline Hurricane::Record* getRecord ( const std::vector<Element>* v )
Hurricane::Record* record = NULL; Hurricane::Record* record = NULL;
if ( !v->empty() ) { if ( !v->empty() ) {
record = new Hurricane::Record ( "const std::vector<Element>" ); record = new Hurricane::Record ( "const std::vector<Element>" );
unsigned n = 1; unsigned n = 0;
typename std::vector<Element>::const_iterator iterator = v->begin(); typename std::vector<Element>::const_iterator iterator = v->begin();
while ( iterator != v->end() ) { while ( iterator != v->end() ) {
record->add ( getSlot<const Element>(getString(n++), *iterator) ); record->add ( getSlot<const Element>(getString(n++), *iterator) );

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

@ -29,8 +29,8 @@
// +-----------------------------------------------------------------+ // +-----------------------------------------------------------------+
#ifndef __HURRICANE_EXTENSION_GO__ #ifndef HURRICANE_EXTENSION_GO_H
#define __HURRICANE_EXTENSION_GO__ #define HURRICANE_EXTENSION_GO_H
#include "hurricane/Name.h" #include "hurricane/Name.h"
#include "hurricane/Go.h" #include "hurricane/Go.h"
@ -67,6 +67,6 @@ namespace Hurricane {
} // End of Hurricane namespace. } // End of Hurricane namespace.
#endif // __HURRICANE_EXTENSION_GO__ #endif // HURRICANE_EXTENSION_GO_H

2
unicorn/src/cgt.py
View File

@ -9,7 +9,7 @@ try:
import Hurricane import Hurricane
import Viewer import Viewer
import CRL import CRL
import Anabatic #import Anabatic
import Etesian import Etesian
import Katabatic import Katabatic
import Kite import Kite