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

Minor corrections to compile under Linux SLSoC

This commit is contained in:
Farakh Javid 2010-02-25 10:59:53 +00:00
parent b2e7ee0fdb
commit 943f28c8fd
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vlsisapd/openChams/Circuit.h
View File

@ -10,6 +10,8 @@
#ifndef __OPENCHAMS_CIRCUIT_H__ #ifndef __OPENCHAMS_CIRCUIT_H__
#define __OPENCHAMS_CIRCUIT_H__ #define __OPENCHAMS_CIRCUIT_H__
#include <vector>
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
@ -33,19 +35,19 @@ class Circuit {
inline Netlist* getNetlist(); inline Netlist* getNetlist();
inline Schematic* getSchematic(); inline Schematic* getSchematic();
inline void addParameter(Name, double); inline void addParameter(Name, double);
inline void addParameter(Name, string); inline void addParameter(Name, std::string);
inline Parameters getParameters(); inline Parameters getParameters();
inline void setNetlist(Netlist*); inline void setNetlist(Netlist*);
inline void setSchematic(Schematic*); inline void setSchematic(Schematic*);
inline void setSizing(Sizing*); inline void setSizing(Sizing*);
bool writeToFile(string filePath); bool writeToFile(std::string filePath);
static Circuit* readFromFile(const string filePath); static Circuit* readFromFile(const std::string filePath);
private: private:
Name readParameter(xmlNode*, double&); Name readParameter(xmlNode*, double&);
Name readParameterEq(xmlNode*, string&); Name readParameterEq(xmlNode*, std::string&);
Name readConnector(xmlNode*); Name readConnector(xmlNode*);
void readCircuitParameters(xmlNode*); void readCircuitParameters(xmlNode*);
void readNetList(xmlNode*); void readNetList(xmlNode*);
@ -64,8 +66,8 @@ class Circuit {
void readEquations(xmlNode*, Sizing*); void readEquations(xmlNode*, Sizing*);
void readEquation(xmlNode*, Sizing*); void readEquation(xmlNode*, Sizing*);
void check_uppercase(string& str, vector<string>& compares, string message); void check_uppercase(std::string& str, std::vector<std::string>& compares, std::string message);
void check_lowercase(string& str, vector<string>& compares, string message); void check_lowercase(std::string& str, std::vector<std::string>& compares, std::string message);
Name _name; Name _name;
Name _techno; Name _techno;
@ -81,7 +83,7 @@ inline double Circuit::getValue(Name name) { return _params.getValue(name);
inline Netlist* Circuit::getNetlist() { return _netlist; }; inline Netlist* Circuit::getNetlist() { return _netlist; };
inline Schematic* Circuit::getSchematic() { return _schematic; }; inline Schematic* Circuit::getSchematic() { return _schematic; };
inline void Circuit::addParameter(Name name, double value) { _params.addParameter(name, value); }; inline void Circuit::addParameter(Name name, double value) { _params.addParameter(name, value); };
inline void Circuit::addParameter(Name name, string eqStr) { _params.addParameter(name, eqStr); }; inline void Circuit::addParameter(Name name, std::string eqStr) { _params.addParameter(name, eqStr); };
inline Parameters Circuit::getParameters() { return _params; }; inline Parameters Circuit::getParameters() { return _params; };
inline void Circuit::setNetlist(Netlist* netlist) { _netlist = netlist; }; inline void Circuit::setNetlist(Netlist* netlist) { _netlist = netlist; };
inline void Circuit::setSchematic(Schematic* schem) { _schematic = schem; }; inline void Circuit::setSchematic(Schematic* schem) { _schematic = schem; };

2
vlsisapd/openChams/Parameters.h
View File

@ -36,7 +36,7 @@ private:
inline bool Parameters::isEmpty() { return ((_params.size() == 0)&&(_paramsEq.size() == 0))? true : false; } inline bool Parameters::isEmpty() { return ((_params.size() == 0)&&(_paramsEq.size() == 0))? true : false; }
inline const std::map<Name, double>& Parameters::getValues() { return _params; }; inline const std::map<Name, double>& Parameters::getValues() { return _params; };
inline const std::map<Name, string>& Parameters::getEqValues() { return _paramsEq; }; inline const std::map<Name, std::string>& Parameters::getEqValues() { return _paramsEq; };
} // namespace } // namespace
#endif #endif

3
vlsisapd/openChams/Sizing.cpp
View File

@ -42,4 +42,5 @@ void Sizing::addEquation(Name equationName, string equation) {
_equations[equationName] = equation; _equations[equationName] = equation;
} }
} // namespace } // namespace