Skip to content

Resolve unary minus code generation issue #1468

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

Merged
hsorby merged 8 commits into from
Oct 16, 2026
Merged

Resolve unary minus code generation issue #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
190a09d
Add unary minus tests.
hsorby Sep 22, 2026
269d169
Fix code formatting issues.
hsorby Sep 22, 2026
1868672
Update test expectations for unary minus handling.
hsorby Sep 22, 2026
d467301
Handle unary minus generation in generator.
hsorby Sep 22, 2026
6a014e6
Add a further two unary minus tests.
hsorby Sep 22, 2026
b9f89e9
Merge branch 'main' into 1464-unary-minus
jmdowrick Oct 14, 2026
b3ebfbd
Merge branch 'main' into 1464-unary-minus
jmdowrick Oct 15, 2026
5cdb83b
Merge branch 'main' into 1464-unary-minus
hsorby Oct 16, 2026
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
4 changes: 3 additions & 1 deletion src/generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,9 @@ std::string Generator::GeneratorImpl::generateMinusUnaryCode(const AnalyserEquat
|| isLogicalOperator(astLeftChild)
|| isPlusOperator(astLeftChild)
|| isMinusOperator(astLeftChild)
|| isPiecewiseStatement(astLeftChild)) {
|| isNegativeNumber(astLeftChild)
|| isPiecewiseStatement(astLeftChild)
|| (code.rfind(mProfile->minusString(), 0) == 0)) {
code = "(" + code + ")";
}

Expand Down
160 changes: 160 additions & 0 deletions tests/generator/generatorunaryminus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
/*
Copyright libCellML Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#include "test_utils.h"

#include "gtest/gtest.h"

#include <libcellml>

TEST(GeneratorUnaryMinus, example01)
{
// rates[0] = --1.0;
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_01.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -(-1.0);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example02)
{
// rates[0] = --2.0*constants[0];
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_02.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -(-2.0*constants[0]);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example03)
{
// rates[0] = --constants[1]/constants[0];
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_03.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -(-constants[1]/constants[0]);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example04)
{
// rates[0] = -(-1.0);
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_04.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -(-1.0);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example05)
{
// rates[0] = -(-constants[1]+constants[0]);
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_05.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -(-constants[1]+constants[0]);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example06)
{
// rates[0] = -pow(-constants[1], constants[0]);
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_06.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = -pow(-constants[1], constants[0]);\n") != std::string::npos);
}

TEST(GeneratorUnaryMinus, example07)
{
// rates[0] = constants[1]-(-constants[0]);
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/unary_minus/example_07.cellml"));

EXPECT_NE(nullptr, model);

auto analyser = libcellml::Analyser::create();
analyser->analyseModel(model);

EXPECT_EQ(size_t(0), analyser->issueCount());

auto generator = libcellml::Generator::create();

auto implementationCode = generator->implementationCode(analyser->analyserModel());

EXPECT_TRUE(implementationCode.find("rates[0] = constants[1]-(-constants[0]);\n") != std::string::npos);
}
1 change: 1 addition & 0 deletions tests/generator/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ list(APPEND LIBCELLML_TESTS ${CURRENT_TEST})
set(${CURRENT_TEST}_SRCS
${CMAKE_CURRENT_LIST_DIR}/generator.cpp
${CMAKE_CURRENT_LIST_DIR}/generatorprofile.cpp
${CMAKE_CURRENT_LIST_DIR}/generatorunaryminus.cpp
${CMAKE_CURRENT_LIST_DIR}/generatorvariabletracker.cpp
)
26 changes: 26 additions & 0 deletions tests/resources/generator/unary_minus/example_01.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<cn cellml:units="dimensionless">-1</cn>
</apply>
</apply>
</math>
</component>
</model>

33 changes: 33 additions & 0 deletions tests/resources/generator/unary_minus/example_02.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<apply>
<times/>
<apply>
<minus/>
<cn cellml:units="dimensionless">2</cn>
</apply>
<ci>a</ci>
</apply>
</apply>
</apply>
</math>
</component>
</model>

33 changes: 33 additions & 0 deletions tests/resources/generator/unary_minus/example_03.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<apply>
<divide/>
<apply>
<minus/>
<ci>a</ci>
</apply>
<ci>b</ci>
</apply>
</apply>
</apply>
</math>
</component>
</model>

29 changes: 29 additions & 0 deletions tests/resources/generator/unary_minus/example_04.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<apply>
<minus/>
<cn cellml:units="dimensionless">1</cn>
</apply>
</apply>
</apply>
</math>
</component>
</model>

33 changes: 33 additions & 0 deletions tests/resources/generator/unary_minus/example_05.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<apply>
<plus/>
<apply>
<minus/>
<ci>a</ci>
</apply>
<ci>b</ci>
</apply>
</apply>
</apply>
</math>
</component>
</model>

33 changes: 33 additions & 0 deletions tests/resources/generator/unary_minus/example_06.cellml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="m">
<component name="c">
<variable name="t" units="dimensionless"/>
<variable name="x" units="dimensionless" initial_value="1"/>
<variable name="a" units="dimensionless" initial_value="2"/>
<variable name="b" units="dimensionless" initial_value="3"/>
<math xmlns="http://www.w3.org/1998/Math/MathML" xmlns:cellml="http://www.cellml.org/cellml/2.0#">
<apply>
<eq/>
<apply>
<diff/>
<bvar>
<ci>t</ci>
</bvar>
<ci>x</ci>
</apply>
<apply>
<minus/>
<apply>
<power/>
<apply>
<minus/>
<ci>a</ci>
</apply>
<ci>b</ci>
</apply>
</apply>
</apply>
</math>
</component>
</model>

Loading
Loading