SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabled nested variables for Ngspice

Browse Source
This commit is contained in:
Vadim Kuznetzov 2015-05-13 15:43:49 +03:00
parent 85b98a3ec1
commit 4bd56c907c
4 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
qucs/components/equation.cpp
View File

@ -100,6 +100,9 @@ Element* Equation::info(QString& Name, char* &BitmapFile, bool getNewOne)
*/
QString Equation::getExpression(bool isXyce)
{
QStringList ng_vars,ngsims;
getNgnutmegVars(ng_vars,ngsims);
QString s;
s.clear();
for (unsigned int i=0;i<Props.count()-1;i++) {
@ -118,7 +121,7 @@ QString Equation::getExpression(bool isXyce)
if (!(fp_pattern.exactMatch(eqn)||
dec_pattern.exactMatch(eqn)||
fp_exp_pattern.exactMatch(eqn))) eqn = "{" + eqn + "}"; // wrap equation if it contains vars
if (!spicecompat::containNodes(tokens)) {
if (!spicecompat::containNodes(tokens,ng_vars)) {
s += QString(".PARAM %1=%2\n").arg(Props.at(i)->Name).arg(eqn);
}
}
@ -136,6 +139,9 @@ QString Equation::getExpression(bool isXyce)
*/
QString Equation::getEquations(QString sim, QStringList &dep_vars)
{
QStringList ng_vars,ngsims;
getNgnutmegVars(ng_vars,ngsims);
QString s;
dep_vars.clear();
for (unsigned int i=0;i<Props.count()-1;i++) {
@ -143,9 +149,13 @@ QString Equation::getEquations(QString sim, QStringList &dep_vars)
QString eqn = Props.at(i)->Value;
spicecompat::splitEqn(eqn,tokens);
eqn.replace("^","**");
if (spicecompat::containNodes(tokens)) {
QString used_sim;
if (spicecompat::containNodes(tokens,ng_vars)) {
QString used_sim="";
spicecompat::convertNodeNames(tokens,used_sim);
if (used_sim.isEmpty()) {
int idx = ng_vars.indexOf(Props.at(i)->Name);
if (idx>=0) used_sim = ngsims.at(idx);
}
if ((sim == used_sim)||(used_sim=="all")) {
eqn = tokens.join("");
s += QString("let %1=%2\n").arg(Props.at(i)->Name).arg(eqn);
@ -164,6 +174,9 @@ QString Equation::getEquations(QString sim, QStringList &dep_vars)
*/
QString Equation::getNgspiceScript()
{
QStringList ng_vars,ngsims;
getNgnutmegVars(ng_vars,ngsims);
QString s;
s.clear();
for (unsigned int i=0;i<Props.count()-1;i++) {
@ -175,9 +188,50 @@ QString Equation::getNgspiceScript()
}
eqn = tokens.join("");
if (!spicecompat::containNodes(tokens)) {
if (!spicecompat::containNodes(tokens,ng_vars)) {
s += QString("let %1=%2\n").arg(Props.at(i)->Name).arg(eqn);
}
}
return s;
}
/*!
* \brief Equation::getNgnutmegVars Extract variables and simulations that are used
* in Ngnutneg script in nested variables
* \param[out] vars
* \param[sims] simulations
*/
void Equation::getNgnutmegVars(QStringList &vars, QStringList &sims)
{
vars.clear();
sims.clear();
for (unsigned int i=0;i<Props.count()-1;i++) {
QStringList tokens;
QString eqn = Props.at(i)->Value;
spicecompat::splitEqn(eqn,tokens);
if (spicecompat::containNodes(tokens,vars)) {
vars.append(Props.at(i)->Name);
QString used_sim="";
spicecompat::convertNodeNames(tokens,used_sim);
if (used_sim.isEmpty()) {
sims.append("all");
} else {
sims.append(used_sim);
}
}
}
foreach (QString var,vars) {
QString sim;
int idx = vars.indexOf(var);
if (idx>=0) sim = sims.at(idx);
if (sim=="all") {
QString eqn = getProperty(var)->Value;
QStringList tokens;
spicecompat::splitEqn(eqn,tokens);
foreach (QString tok,tokens) {
int idx1 = vars.indexOf(tok);
if ((idx1>=0)&&(sims[idx1]!="all")) sims[idx]=sims[idx1];
}
}
}
}

3
qucs/components/equation.h
View File

@ -32,6 +32,9 @@ public:
QString getEquations(QString sim, QStringList &dep_vars);
QString getNgspiceScript();
private:
void getNgnutmegVars(QStringList &vars,QStringList &sims);
protected:
QString vhdlCode(int);
QString verilogCode(int);

5
qucs/extsimkernels/spicecompat.cpp
View File

@ -120,9 +120,10 @@ void spicecompat::splitEqn(QString &eqn, QStringList &tokens)
* \brief spicecompat::containNodes Determine are there in equaton node voltages
* and/or current porbes.
* \param tokens List of tokens. Should be obtained with splitEqn().
* \param vars List of vars that are used in ngnutmeg script.
* \return Return true if equation contain node voltages and/or current probe variables
*/
bool spicecompat::containNodes(QStringList &tokens)
bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
{
QRegExp var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
QStringList system_vars;
@ -132,6 +133,7 @@ bool spicecompat::containNodes(QStringList &tokens)
if (var_pattern.exactMatch(tok)) return true;
if (system_vars.contains(tok)) return true;
if (tok.endsWith("#branch")) return true;
if (vars.contains(tok)) return true;
}
for (QStringList::iterator it=tokens.begin();it!=tokens.end();it++) {
if ((*it).toUpper()=="V") { // voltages in spice notation
@ -151,6 +153,7 @@ bool spicecompat::containNodes(QStringList &tokens)
* "ac" --- AC simulation;
* "dc" --- DC simulation;
* "tran" --- Transient simulation;
* "all" --- All simulations;
*/
void spicecompat::convertNodeNames(QStringList &tokens, QString &sim)
{

2
qucs/extsimkernels/spicecompat.h
View File

@ -14,7 +14,7 @@ namespace spicecompat {
QString normalize_value(QString Value);
QString convert_functions(QString tok, bool isXyce);
void splitEqn(QString &eqn, QStringList &tokens);
bool containNodes(QStringList &tokens);
bool containNodes(QStringList &tokens, QStringList &vars);
void convertNodeNames(QStringList &tokens, QString &sim);
}