Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix units in CVODE with an improved method #1565

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix units in CVODE with an improved method #1565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/visitors/cvode_visitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "utils/logger.hpp"
#include "visitors/visitor_utils.hpp"
#include <optional>
#include <regex>
#include <utility>

namespace pywrap = nmodl::pybind_wrappers;
Expand All @@ -38,18 +37,14 @@ static void remove_conserve_statements(ast::StatementBlock& node) {

// remove units from CVODE block so sympy can parse it properly
static void remove_units(ast::BinaryExpression& node) {
// matches either an int or a float, followed by any (including zero)
// number of spaces, followed by an expression in parentheses, that only
// has letters of the alphabet
std::regex unit_pattern(R"((\d+\.?\d*|\.\d+)\s*\([a-zA-Z]+\))");
auto rhs_string = to_nmodl(node.get_rhs());
auto rhs_string_no_units = fmt::format("{} = {}",
to_nmodl(node.get_lhs()),
std::regex_replace(rhs_string, unit_pattern, "$1"));
auto statement =
fmt::format("{} = {}",
to_nmodl(node.get_lhs()),
to_nmodl(node.get_rhs(), {ast::AstNodeType::UNIT, ast::AstNodeType::UNIT_DEF}));
logger->debug("CvodeVisitor :: removing units from statement {}", to_nmodl(node));
logger->debug("CvodeVisitor :: result: {}", rhs_string_no_units);
logger->debug("CvodeVisitor :: result: {}", statement);
auto expr_statement = std::dynamic_pointer_cast<ast::ExpressionStatement>(
create_statement(rhs_string_no_units));
create_statement(statement));
const auto bin_expr = std::dynamic_pointer_cast<const ast::BinaryExpression>(
expr_statement->get_expression());
node.set_rhs(std::shared_ptr<ast::Expression>(bin_expr->get_rhs()->clone()));
Expand Down
Loading