Skip to content

Commit

Permalink
Add more tests of the Expression class (#7955)
Browse files Browse the repository at this point in the history 
- Add more tests.
- Remove the case in Expression that evaluates DynamicSelect to its
  second argument, since it ended up not being used in OMEdit and
  removing it improves the testing.
  • Loading branch information
@perost
perost committed Sep 30, 2021
1 parent f465ce5 commit df49713
Show file tree
Hide file tree
Showing 3 changed files with 228 additions and 7 deletions.
2 changes: 0 additions & 2 deletions OMEdit/OMEditLIB/FlatModelica/Expression.cpp
View file
Expand Up @@ -1124,8 +1124,6 @@ namespace FlatModelica
case djb2_hash("symmetric"): return evalSymmetric(args[0]);
// 10.4.2
case djb2_hash("cat"): return evalCat(args);
//
case djb2_hash("DynamicSelect"): return args[1];
}

return Expression(std::make_unique<Call>(_name, std::move(args)));
Expand Down
226 changes: 222 additions & 4 deletions OMEdit/Testsuite/Expression/ExpressionTest.cpp
View file
Expand Up @@ -45,17 +45,235 @@ extern "C" {

OMEDITTEST_MAIN(ExpressionTest)

void ExpressionTest::dynamicSelectString()
QString evalString(const QString &str)
{
QString str = "DynamicSelect(\"0.0\", String(showNumber, significantDigits, 0, true))";
return FlatModelica::Expression::parse(str).evaluate([] (const std::string &) {
// Assume that all variables have the value 1.0 for testing purposes.
return 1.0;
}).toQString();
}

void ExpressionTest::dynamicSelect()
{
QFETCH(QString, string);
QFETCH(QString, result);

try {
QCOMPARE(evalString(string), result);
} catch (const std::exception &e) {
qDebug() << e.what();
QFAIL(QString("Failed to evaluate: ").arg(string).toStdString().c_str());
}
}

void ExpressionTest::dynamicSelect_data()
{
QTest::addColumn<QString>("string");
QTest::addColumn<QString>("result");

QTest::newRow("DynamicSelect1")
<< "DynamicSelect(\"0.0\", String(showNumber, significantDigits, 0, true))"
<< "DynamicSelect(\"0.0\",\"1\")";

QTest::newRow("DynamicSelect2")
<< "DynamicSelect({{-35, 35}, {35, -35}}, {{-0, port_1.m_flow * 0}, {0, -0}})"
<< "DynamicSelect({{-35,35},{35,-35}},{{0,0},{0,0}})";

QTest::addRow("DynamicSelect3")
<< "DynamicSelect(\"\", String(T - 273.15, \".1f\"))"
<< "DynamicSelect(\"\",\"-272.1\")";

QTest::addRow("DynamicSelect4")
<< "DynamicSelect(\"\", String((if use_T_in then T_in else T) - 273.15, \".1f\"))"
<< "DynamicSelect(\"\",\"-272.1\")";

QTest::addRow("DynamicSelect5")
<< "DynamicSelect({{-100, 10}, {-100, 10}}, {{100.0, 10.0}, {100.0 + 200.0 * max(-1.0, min(0.0, m_flow / abs(m_flow_nominal))), -10.0}})"
<< "DynamicSelect({{-100,10},{-100,10}},{{100,10},{100,-10}})";

QTest::addRow("DynamicSelect6")
<< "DynamicSelect({{-100, 10}, {-100, 10}}, {{-100.0, 10.0}, {(-100.0) + 200.0 * min(1.0, max(0.0, m_flow / abs(m_flow_nominal))), -10.0}})"
<< "DynamicSelect({{-100,10},{-100,10}},{{-100,10},{100,-10}})";

QTest::addRow("DynamicSelect7")
<< "DynamicSelect({{-100, 10}, {-100, 10}}, {{-100.0, 10.0}, {(-100.0) + 100.0 * min(1.0, max(0.0, port_1.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3])))), -10.0}})"
<< "DynamicSelect({{-100,10},{-100,10}},{{-100,10},{0,-10}})";

QTest::addRow("DynamicSelect8")
<< "DynamicSelect({{-100, 10}, {-100, 10}}, {{0.0, 10.0}, {100.0 * max(-1.0, min(0.0, port_1.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3])))), -10.0}})"
<< "DynamicSelect({{-100,10},{-100,10}},{{0,10},{0,-10}})";

QTest::addRow("DynamicSelect9")
<< "DynamicSelect({{0, 10}, {0, 10}}, {{100.0, 10.0}, {(1.0 - min(1.0, max(0.0, port_2.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3]))))) * 100.0, -10.0}})"
<< "DynamicSelect({{0,10},{0,10}},{{100,10},{0,-10}})";

QTest::addRow("DynamicSelect10")
<< "DynamicSelect({{0, 10}, {0, 10}}, {{0.0, 10.0}, {-max(-1.0, min(0.0, port_2.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3])))) * 100.0, -10.0}})"
<< "DynamicSelect({{0,10},{0,10}},{{0,10},{-0,-10}})";

QTest::addRow("DynamicSelect11")
<< "DynamicSelect({{-10, 0}, {-10, 0}}, {{-10.0, (-100.0) + 100.0 * min(1.0, max(0.0, port_3.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3]))))}, {10.0, -100.0}})"
<< "DynamicSelect({{-10,0},{-10,0}},{{-10,0},{10,-100}})";

QTest::addRow("DynamicSelect12")
<< "DynamicSelect({{-10, 0}, {-10, 0}}, {{-10.0, 100.0 * max(-1.0, min(0.0, port_3.m_flow * 3.0 / (abs(m_flow_nominal[1]) + abs(m_flow_nominal[2]) + abs(m_flow_nominal[3]))))}, {10.0, 0.0}})"
<< "DynamicSelect({{-10,0},{-10,0}},{{-10,0},{10,0}})";

QTest::addRow("DynamicSelect13")
<< "DynamicSelect({{-35, 35}, {35, -35}}, {{-0.0, 0.0}, {0.0, -0.0}})"
<< "DynamicSelect({{-35,35},{35,-35}},{{-0,0},{0,-0}})";

QTest::addRow("DynamicSelect14")
<< "DynamicSelect({170, 213, 255}, {min(1.0, max(0.0, 1.0 - (T - 273.15) / 50.0)) * 28.0 + min(1.0, max(0.0, (T - 273.15) / 50.0)) * 255.0, min(1.0, max(0.0, 1.0 - (T - 273.15) / 50.0)) * 108.0, min(1.0, max(0.0, 1.0 - (T - 273.15) / 50.0)) * 200.0})"
<< "DynamicSelect({170,213,255},{28,108,200})";

QTest::addRow("DynamicSelect15")
<< "DynamicSelect({0, 127, 255}, {min(1.0, max(0.0, 1.0 - ((if use_T_in then T_in else T) - 273.15) / 50.0)) * 28.0 + min(1.0, max(0.0, ((if use_T_in then T_in else T) - 273.15) / 50.0)) * 255.0, min(1.0, max(0.0, 1.0 - ((if use_T_in then T_in else T) - 273.15) / 50.0)) * 108.0, min(1.0, max(0.0, 1.0 - ((if use_T_in then T_in else T) - 273.15) / 50.0)) * 200.0})"
<< "DynamicSelect({0,127,255},{28,108,200})";
}

void ExpressionTest::operators()
{
QFETCH(QString, string);
QFETCH(QString, result);

try {
QCOMPARE(evalString(string), result);
} catch (const std::exception &e) {
qDebug() << e.what();
QFAIL(QString("Failed to evaluate: ").arg(string).toStdString().c_str());
}
}

void ExpressionTest::operators_data()
{
QTest::addColumn<QString>("string");
QTest::addColumn<QString>("result");

QTest::newRow("logic1")
<< "x and y or z"
<< "true";

QTest::newRow("logic2")
<< "{true, true, false} and {true, false, true}"
<< "{true,false,false}";

QTest::newRow("arithmetic1")
<< "1 + 4 * 5 / 2 + x"
<< "12";

QTest::newRow("array + array")
<< "{1, 2, 3} + {4, 5, 6}"
<< "{5,7,9}";

QTest::newRow("scalar .+ array")
<< "1 .+ {1, 2, 3}"
<< "{2,3,4}";

QTest::newRow("array .- array")
<< "{1, 2, 3} .- {6, 5, 4}"
<< "{-5,-3,-1}";

QTest::newRow("array .- scalar")
<< "{4, 3, 2} .- 2"
<< "{2,1,0}";

QTest::newRow("array .^ scalar")
<< "{3, 4, 5} .^ 2"
<< "{9,16,25}";

QTest::newRow("matrix * vector")
<< "{{1, 2}, {3, 4}} * {5, 6}"
<< "{17,39}";

QTest::newRow("vector * matrix")
<< "{5, 6} * {{1, 2}, {3, 4}}"
<< "{23,34}";

QTest::newRow("matrix * matrix")
<< "{{1, 2, 4}, {3, 4, 6}, {4, 6, 3}} * {{5, 6, 9}, {7, 8, 3}, {3, 4, 7}}"
<< "{{31,38,43},{61,74,81},{71,84,75}}";

QTest::newRow("matrix ^ scalar")
<< "{{1, 2}, {3, 4}} ^ 3"
<< "{{37,54},{81,118}}";

QTest::newRow("- array")
<< "-{1, 2, 3}"
<< "{-1,-2,-3}";
}

void ExpressionTest::functions()
{
QFETCH(QString, string);
QFETCH(QString, result);

try {
FlatModelica::Expression::parse(str);
QCOMPARE(evalString(string), result);
} catch (const std::exception &e) {
qDebug() << e.what();
QFAIL(QString("Failed to parse:").arg(str).toStdString().c_str());
QFAIL(QString("Failed to evaluate: ").arg(string).toStdString().c_str());
}
}

void ExpressionTest::functions_data()
{
QTest::addColumn<QString>("string");
QTest::addColumn<QString>("result");

QTest::newRow("integer")
<< "integer(-3.8)"
<< "-4";

QTest::newRow("ones")
<< "ones(3, 4)"
<< "{{1,1,1,1},{1,1,1,1},{1,1,1,1}}";

QTest::newRow("fill")
<< "fill(true, 2, 3)"
<< "{{true,true,true},{true,true,true}}";

QTest::newRow("sum1")
<< "sum(ones(4, 5))"
<< "20";

QTest::newRow("min1")
<< "min({{2, 3, 4}, {-8, 1, 9}})"
<< "-8";

QTest::newRow("min2")
<< "min({{}, {1, 2}})"
<< "1";

QTest::newRow("min3")
<< "min({})"
<< "1.79769e+308";

QTest::newRow("transpose")
<< "transpose({{1, 2}, {3, 4}})"
<< "{{1,3},{2,4}}";

QTest::newRow("symmetric")
<< "symmetric({{1, 2, 3}, {4, 5, 6}, {7, 8, 9}})"
<< "{{1,2,3},{2,5,6},{3,6,9}}";

QTest::newRow("size1")
<< "size({{1, 2, 3}, {4, 5, 6}})"
<< "{2,3}";

QTest::newRow("size2")
<< "size({{1, 2, 3}, {4, 5, 6}}, 2)"
<< "3";

QTest::newRow("identity")
<< "identity(3)"
<< "{{1,0,0},{0,1,0},{0,0,1}}";

QTest::newRow("diagonal")
<< "diagonal({1, 2, 3})"
<< "{{1,0,0},{0,2,0},{0,0,3}}";
}

void ExpressionTest::cleanupTestCase()
{
MainWindow::instance()->close();
Expand Down
7 changes: 6 additions & 1 deletion OMEdit/Testsuite/Expression/ExpressionTest.h
View file
Expand Up @@ -46,7 +46,12 @@ class ExpressionTest: public QObject
Q_OBJECT

private slots:
void dynamicSelectString();
void dynamicSelect();
void dynamicSelect_data();
void operators();
void operators_data();
void functions();
void functions_data();
void cleanupTestCase();
};

Expand Down

0 comments on commit df49713

Please sign in to comment.