Adapt all files to new source tree

vlsisapd/src/openChams/src/Circuit.cpp

@@ -14,8 +14,15 @@
 #include <algorithm>
 using namespace std;
 
-#include "Circuit.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Circuit.h"
+#include "vlsisapd/openChams/Netlist.h"
+#include "vlsisapd/openChams/Instance.h"
+#include "vlsisapd/openChams/Net.h"
+#include "vlsisapd/openChams/Schematic.h"
+#include "vlsisapd/openChams/Sizing.h"
+#include "vlsisapd/openChams/Transistor.h"
+#include "vlsisapd/openChams/Operator.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace {
 	template<class T> T getValue(xmlChar* str) {

vlsisapd/src/openChams/src/Instance.cpp

@@ -10,11 +10,11 @@
 #include <iostream>
 using namespace std;
 
-#include "Instance.h"
-#include "Netlist.h"
-#include "Net.h"
-#include "Transistor.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Instance.h"
+#include "vlsisapd/openChams/Netlist.h"
+#include "vlsisapd/openChams/Net.h"
+#include "vlsisapd/openChams/Transistor.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 Instance::Instance(Name name, Name model, Name mosType, bool sourceBulkConnected, Netlist* netlist)

vlsisapd/src/openChams/src/Name.cpp

@@ -9,7 +9,7 @@
 
 using namespace std;
 
-#include "Name.h"
+#include "vlsisapd/openChams/Name.h"
 
 namespace OpenChams {
 unsigned long Name::_globalId = 0;

vlsisapd/src/openChams/src/Net.cpp

@@ -9,8 +9,8 @@
 
 using namespace std;
 
-#include "Net.h"
-#include "Netlist.h"
+#include "vlsisapd/openChams/Net.h"
+#include "vlsisapd/openChams/Netlist.h"
 
 namespace OpenChams {
 Net::Net(Name netName, Name typeName, bool isExternal, Netlist* netlist) 

vlsisapd/src/openChams/src/Netlist.cpp

@@ -11,9 +11,11 @@
 #include <algorithm>
 using namespace std;
 
-#include "Netlist.h"
-#include "Circuit.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Netlist.h"
+#include "vlsisapd/openChams/Instance.h"
+#include "vlsisapd/openChams/Net.h"
+#include "vlsisapd/openChams/Circuit.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 Netlist::Netlist(Circuit* circuit) : _circuit(circuit) {}

vlsisapd/src/openChams/src/Operator.cpp

@@ -10,8 +10,8 @@
 #include <string>
 using namespace std;
 
-#include "Operator.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Operator.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 Operator::Operator(Name operatorName, Name simulModel, unsigned callOrder) 

vlsisapd/src/openChams/src/Parameters.cpp

@@ -11,8 +11,9 @@
 #include <string>
 using namespace std;
 
-#include "Parameters.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Name.h"
+#include "vlsisapd/openChams/Parameters.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 double Parameters::getValue(Name name) {

vlsisapd/src/openChams/src/Schematic.cpp

@@ -9,8 +9,8 @@
 
 using namespace std;
 
-#include "Schematic.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Schematic.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 Schematic::Schematic(Circuit* circuit, double zoom) 

vlsisapd/src/openChams/src/Sizing.cpp

@@ -10,10 +10,10 @@
 #include <string>
 using namespace std;
 
-#include "Sizing.h"
-#include "Circuit.h"
-#include "Operator.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Sizing.h"
+#include "vlsisapd/openChams/Circuit.h"
+#include "vlsisapd/openChams/Operator.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 Sizing::Sizing(Circuit* circuit): _circuit(circuit) {}

vlsisapd/src/openChams/src/Transistor.cpp

@@ -10,10 +10,10 @@
 #include <iostream>
 using namespace std;
 
-#include "Transistor.h"
-#include "Instance.h"
-#include "Net.h"
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/Transistor.h"
+#include "vlsisapd/openChams/Instance.h"
+#include "vlsisapd/openChams/Net.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
     Transistor::Transistor(Name name, Instance* instance)

vlsisapd/src/openChams/src/vlsisapd/openChams/Circuit.h

@@ -15,17 +15,18 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "Name.h"
-#include "Parameters.h"
-#include "Netlist.h"
-#include "Instance.h"
-#include "Net.h"
-#include "Schematic.h"
-#include "Sizing.h"
-#include "Transistor.h"
-#include "Operator.h"
+#include "vlsisapd/openChams/Name.h"
+#include "vlsisapd/openChams/Parameters.h"
 
 namespace OpenChams {
+class Netlist;
+class Instance;
+class Net;
+class Schematic;
+class Sizing;
+class Transistor;
+class Operator;
+
 class Circuit {
     public:
     Circuit(Name name, Name techno);

vlsisapd/src/openChams/src/vlsisapd/openChams/Instance.h

@@ -13,8 +13,8 @@
 #include <map>
 #include <vector>
 
-#include "Name.h"
-#include "Parameters.h"
+#include "vlsisapd/openChams/Name.h"
+#include "vlsisapd/openChams/Parameters.h"
 
 namespace OpenChams {
 class Netlist;

vlsisapd/src/openChams/src/vlsisapd/openChams/Name.h

@@ -13,7 +13,7 @@
 #include <string>
 #include <map>
 
-#include "OpenChamsException.h"
+#include "vlsisapd/openChams/OpenChamsException.h"
 
 namespace OpenChams {
 class Name {

vlsisapd/src/openChams/src/vlsisapd/openChams/Net.h

@@ -12,8 +12,7 @@
 
 #include <vector>
 
-#include "Name.h"
-#include "Instance.h"
+#include "vlsisapd/openChams/Name.h"
 
 namespace OpenChams {
 class Netlist;

vlsisapd/src/openChams/src/vlsisapd/openChams/Netlist.h

@@ -12,12 +12,12 @@
 
 #include <vector>
 
-#include "Name.h"
-#include "Instance.h"
-#include "Net.h"
-
 namespace OpenChams {
+class Name;
+class Instance;
+class Net;
 class Circuit;
+
 class Netlist {
 	public:
     Netlist(Circuit*);
@@ -28,13 +28,8 @@ class Netlist {
     Instance* getInstance(Name);
     Net* getNet(Name);
     
-    //pour parcourir les vector
     inline bool hasNoInstances();
     inline bool hasNoNets();
-    //inline vector<Instance*>::iterator getFirstInstanceIt();
-    //inline vector<Instance*>::iterator getLastInstanceIt();
-    //inline vector<Net*>::iterator getFirstNetIt();
-    //inline vector<Net*>::iterator getLastNetIt();
     inline const std::vector<Instance*>& getInstances();
     inline const std::vector<Net*>& getNets();
     
@@ -44,12 +39,8 @@ class Netlist {
     std::vector<Net*>      _nets;
 };
     
-inline bool 					Netlist::hasNoInstances() { return (_instances.size() == 0)? true : false; }
-inline bool 					Netlist::hasNoNets()      { return (_nets.size() == 0)? true : false; }
-//inline vector<Instance*>::iterator Netlist::getFirstInstanceIt() { return _instances.begin(); }
-//inline vector<Instance*>::iterator Netlist::getLastInstanceIt()  { return _instances.end(); }
-//inline vector<Net*>::iterator      Netlist::getFirstNetIt()      { return _nets.begin(); }
-//inline vector<Net*>::iterator      Netlist::getLastNetIt()       { return _nets.end(); }
+inline bool Netlist::hasNoInstances() { return (_instances.size() == 0)? true : false; }
+inline bool Netlist::hasNoNets()      { return (_nets.size() == 0)? true : false; }
 inline const std::vector<Instance*>& Netlist::getInstances()   { return _instances; };
 inline const std::vector<Net*>&      Netlist::getNets()        { return _nets; };
     

vlsisapd/src/openChams/src/vlsisapd/openChams/Operator.h

@@ -12,7 +12,7 @@
 
 #include <map>
 
-#include "Name.h"
+#include "vlsisapd/openChams/Name.h"
 
 namespace OpenChams {
 class Operator {

vlsisapd/src/openChams/src/vlsisapd/openChams/Parameters.h

@@ -12,9 +12,9 @@
 
 #include <map>
 
-#include "Name.h"
-
 namespace OpenChams {
+class Name;
+
 class Parameters {
 public:
     Parameters() {};

vlsisapd/src/openChams/src/vlsisapd/openChams/Schematic.h

@@ -12,10 +12,11 @@
 
 #include <map>
 
-#include "Name.h"
+#include "vlsisapd/openChams/Name.h"
 
 namespace OpenChams {
 class Circuit;
+
 class Schematic {
 	public:
     class Infos {

vlsisapd/src/openChams/src/vlsisapd/openChams/Sizing.h

@@ -12,12 +12,12 @@
 
 #include <map>
 
-#include "Name.h"
-
 namespace OpenChams {
-    class Circuit;
-    class Operator;
-    class Sizing {
+class Name;
+class Circuit;
+class Operator;
+
+class Sizing {
 	public:
         Sizing(Circuit*);
         

vlsisapd/src/openChams/src/vlsisapd/openChams/Transistor.h

@@ -13,13 +13,13 @@
 
 #include <map>
 
-#include "Name.h"
-#include "Parameters.h"
+#include "vlsisapd/openChams/Name.h"
+#include "vlsisapd/openChams/Parameters.h"
 
 namespace OpenChams {
-    class Instance;
-    class Net;
-    class Transistor {
+class Instance;
+class Net;
+class Transistor {
 	public:
         Transistor(Name, Instance*);