Skip to content

Commit 5246a31

Browse files
agarnyagarny
committed
Merge branch 'main' into issue1244
2 parents 9629866 + 5c0a26a commit 5246a31

File tree

226 files changed

+5083
-5047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+5083
-5047
lines changed

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ set(MODULE_HEADER_FILES
121121
)
122122

123123
set(GIT_HEADER_FILES
124+
${CMAKE_CURRENT_SOURCE_DIR}/analyser_p.h
124125
${CMAKE_CURRENT_SOURCE_DIR}/analyserequation_p.h
125126
${CMAKE_CURRENT_SOURCE_DIR}/analyserequationast_p.h
126127
${CMAKE_CURRENT_SOURCE_DIR}/analyserexternalvariable_p.h

‎src/analyser.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ bool AnalyserInternalEquation::check(const AnalyserModelPtr &model, bool checkNl
238238
for (const auto &variable : mAllVariables) {
239239
switch (variable->mType) {
240240
case AnalyserInternalVariable::Type::INITIALISED:
241-
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC:
241+
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC_VARIABLE:
242242
// The equation contains an initialised variable, so track it
243243
// and consider it as an algebraic variable.
244244

245245
initialisedVariables.push_back(variable);
246246

247-
variable->mType = AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC;
247+
variable->mType = AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC_VARIABLE;
248248

249249
break;
250250
default:
@@ -302,15 +302,15 @@ bool AnalyserInternalEquation::check(const AnalyserModelPtr &model, bool checkNl
302302
AnalyserInternalVariable::Type::COMPUTED_TRUE_CONSTANT :
303303
mComputedVariableBasedConstant ?
304304
AnalyserInternalVariable::Type::COMPUTED_VARIABLE_BASED_CONSTANT :
305-
AnalyserInternalVariable::Type::ALGEBRAIC;
305+
AnalyserInternalVariable::Type::ALGEBRAIC_VARIABLE;
306306
}
307307

308308
switch (variable->mType) {
309309
case AnalyserInternalVariable::Type::STATE:
310310
case AnalyserInternalVariable::Type::COMPUTED_TRUE_CONSTANT:
311311
case AnalyserInternalVariable::Type::COMPUTED_VARIABLE_BASED_CONSTANT:
312-
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC:
313-
case AnalyserInternalVariable::Type::ALGEBRAIC:
312+
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC_VARIABLE:
313+
case AnalyserInternalVariable::Type::ALGEBRAIC_VARIABLE:
314314
variable->mIsKnownStateVariable = variable->mType == AnalyserInternalVariable::Type::STATE;
315315

316316
mUnknownVariables.push_back(variable);
@@ -767,7 +767,7 @@ void Analyser::AnalyserImpl::analyseNode(const XmlNodePtr &node,
767767
auto iter = mStandardUnits.find(unitsName);
768768

769769
if (iter == mStandardUnits.end()) {
770-
auto units = libcellml::Units::create(unitsName);
770+
auto units = Units::create(unitsName);
771771

772772
mCiCnUnits.emplace(ast, units);
773773
mStandardUnits.emplace(unitsName, units);
@@ -2731,7 +2731,7 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
27312731
// an initial guess) that needs to be computed using an NLA
27322732
// system. So, requalify the unknown variable and equation.
27332733

2734-
unknownVariable->mType = AnalyserInternalVariable::Type::ALGEBRAIC;
2734+
unknownVariable->mType = AnalyserInternalVariable::Type::ALGEBRAIC_VARIABLE;
27352735
internalEquation->mType = AnalyserInternalEquation::Type::ALGEBRAIC;
27362736

27372737
break;
@@ -2881,16 +2881,16 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
28812881
auto stateIndex = MAX_SIZE_T;
28822882
auto constantIndex = MAX_SIZE_T;
28832883
auto computedConstantIndex = MAX_SIZE_T;
2884-
auto algebraicIndex = MAX_SIZE_T;
2885-
auto externalIndex = MAX_SIZE_T;
2884+
auto algebraicVariableIndex = MAX_SIZE_T;
2885+
auto externalVariableIndex = MAX_SIZE_T;
28862886

28872887
for (const auto &internalVariable : mInternalVariables) {
28882888
// Determine the type of the variable.
28892889

28902890
AnalyserVariable::Type variableType;
28912891

28922892
if (internalVariable->mIsExternalVariable) {
2893-
variableType = AnalyserVariable::Type::EXTERNAL;
2893+
variableType = AnalyserVariable::Type::EXTERNAL_VARIABLE;
28942894
} else {
28952895
switch (internalVariable->mType) {
28962896
case AnalyserInternalVariable::Type::STATE:
@@ -2906,9 +2906,9 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
29062906
variableType = AnalyserVariable::Type::COMPUTED_CONSTANT;
29072907

29082908
break;
2909-
case AnalyserInternalVariable::Type::ALGEBRAIC:
2910-
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC:
2911-
variableType = AnalyserVariable::Type::ALGEBRAIC;
2909+
case AnalyserInternalVariable::Type::ALGEBRAIC_VARIABLE:
2910+
case AnalyserInternalVariable::Type::INITIALISED_ALGEBRAIC_VARIABLE:
2911+
variableType = AnalyserVariable::Type::ALGEBRAIC_VARIABLE;
29122912

29132913
break;
29142914
default: // AnalyserInternalVariable::Type::VARIABLE_OF_INTEGRATION.
@@ -2937,7 +2937,7 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
29372937
// Correct the type of the variable if it is a computed constant that is computed using an NLA equation.
29382938

29392939
if ((variableType == AnalyserVariable::Type::COMPUTED_CONSTANT) && isNlaEquation) {
2940-
variableType = AnalyserVariable::Type::ALGEBRAIC;
2940+
variableType = AnalyserVariable::Type::ALGEBRAIC_VARIABLE;
29412941
}
29422942

29432943
// Populate and keep track of the state/variable.
@@ -2951,10 +2951,10 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
29512951
++constantIndex :
29522952
(variableType == AnalyserVariable::Type::COMPUTED_CONSTANT) ?
29532953
++computedConstantIndex :
2954-
(variableType == AnalyserVariable::Type::ALGEBRAIC) ?
2955-
++algebraicIndex :
2956-
++externalIndex,
2957-
(variableType == AnalyserVariable::Type::EXTERNAL) ?
2954+
(variableType == AnalyserVariable::Type::ALGEBRAIC_VARIABLE) ?
2955+
++algebraicVariableIndex :
2956+
++externalVariableIndex,
2957+
(variableType == AnalyserVariable::Type::EXTERNAL_VARIABLE) ?
29582958
nullptr :
29592959
internalVariable->mInitialisingVariable,
29602960
internalVariable->mVariable, mModel, equations);
@@ -2968,10 +2968,10 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
29682968
mModel->mPimpl->mConstants.push_back(variable);
29692969
} else if (variableType == AnalyserVariable::Type::COMPUTED_CONSTANT) {
29702970
mModel->mPimpl->mComputedConstants.push_back(variable);
2971-
} else if (variableType == AnalyserVariable::Type::ALGEBRAIC) {
2972-
mModel->mPimpl->mAlgebraic.push_back(variable);
2973-
} else { // AnalyserVariable::Type::EXTERNAL.
2974-
mModel->mPimpl->mExternals.push_back(variable);
2971+
} else if (variableType == AnalyserVariable::Type::ALGEBRAIC_VARIABLE) {
2972+
mModel->mPimpl->mAlgebraicVariables.push_back(variable);
2973+
} else { // AnalyserVariable::Type::EXTERNAL_VARIABLE.
2974+
mModel->mPimpl->mExternalVariables.push_back(variable);
29752975
}
29762976
}
29772977

@@ -3086,10 +3086,10 @@ void Analyser::AnalyserImpl::analyseModel(const ModelPtr &model)
30863086
equation->mPimpl->mStates.push_back(variable);
30873087
} else if (variableType == AnalyserVariable::Type::COMPUTED_CONSTANT) {
30883088
equation->mPimpl->mComputedConstants.push_back(variable);
3089-
} else if (variableType == AnalyserVariable::Type::ALGEBRAIC) {
3090-
equation->mPimpl->mAlgebraic.push_back(variable);
3091-
} else { // AnalyserVariable::Type::EXTERNAL.
3092-
equation->mPimpl->mExternals.push_back(variable);
3089+
} else if (variableType == AnalyserVariable::Type::ALGEBRAIC_VARIABLE) {
3090+
equation->mPimpl->mAlgebraicVariables.push_back(variable);
3091+
} else { // AnalyserVariable::Type::EXTERNAL_VARIABLE.
3092+
equation->mPimpl->mExternalVariables.push_back(variable);
30933093
}
30943094
}
30953095

‎src/analyser_p.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ struct AnalyserInternalVariable
4949
CONSTANT,
5050
COMPUTED_TRUE_CONSTANT,
5151
COMPUTED_VARIABLE_BASED_CONSTANT,
52-
INITIALISED_ALGEBRAIC,
53-
ALGEBRAIC,
52+
INITIALISED_ALGEBRAIC_VARIABLE,
53+
ALGEBRAIC_VARIABLE,
5454
OVERCONSTRAINED
5555
};
5656

@@ -159,7 +159,7 @@ class Analyser::AnalyserImpl: public Logger::LoggerImpl
159159
AnalyserInternalVariablePtrs mInternalVariables;
160160
AnalyserInternalEquationPtrs mInternalEquations;
161161

162-
GeneratorProfilePtr mGeneratorProfile = libcellml::GeneratorProfile::create();
162+
GeneratorProfilePtr mGeneratorProfile = GeneratorProfile::create();
163163

164164
std::map<std::string, UnitsPtr> mStandardUnits;
165165
std::map<AnalyserEquationAstPtr, UnitsPtr> mCiCnUnits;

‎src/analyserequation.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ AnalyserEquationPtr AnalyserEquation::AnalyserEquationImpl::create()
3131

3232
bool AnalyserEquation::AnalyserEquationImpl::isDummyDependency(const AnalyserEquationWeakPtr &dependency)
3333
{
34-
return libcellml::variables(dependency.lock()).empty();
34+
return libcellml::analyserVariables(dependency.lock()).empty();
3535
}
3636

3737
void AnalyserEquation::AnalyserEquationImpl::removeDummyDependencies()
@@ -182,42 +182,42 @@ AnalyserVariablePtr AnalyserEquation::computedConstant(size_t index) const
182182
return mPimpl->mComputedConstants[index];
183183
}
184184

185-
size_t AnalyserEquation::algebraicCount() const
185+
size_t AnalyserEquation::algebraicVariableCount() const
186186
{
187-
return mPimpl->mAlgebraic.size();
187+
return mPimpl->mAlgebraicVariables.size();
188188
}
189189

190-
std::vector<AnalyserVariablePtr> AnalyserEquation::algebraic() const
190+
std::vector<AnalyserVariablePtr> AnalyserEquation::algebraicVariables() const
191191
{
192-
return mPimpl->mAlgebraic;
192+
return mPimpl->mAlgebraicVariables;
193193
}
194194

195-
AnalyserVariablePtr AnalyserEquation::algebraic(size_t index) const
195+
AnalyserVariablePtr AnalyserEquation::algebraicVariable(size_t index) const
196196
{
197-
if (index >= mPimpl->mAlgebraic.size()) {
197+
if (index >= mPimpl->mAlgebraicVariables.size()) {
198198
return {};
199199
}
200200

201-
return mPimpl->mAlgebraic[index];
201+
return mPimpl->mAlgebraicVariables[index];
202202
}
203203

204-
size_t AnalyserEquation::externalCount() const
204+
size_t AnalyserEquation::externalVariableCount() const
205205
{
206-
return mPimpl->mExternals.size();
206+
return mPimpl->mExternalVariables.size();
207207
}
208208

209-
std::vector<AnalyserVariablePtr> AnalyserEquation::externals() const
209+
std::vector<AnalyserVariablePtr> AnalyserEquation::externalVariables() const
210210
{
211-
return mPimpl->mExternals;
211+
return mPimpl->mExternalVariables;
212212
}
213213

214-
AnalyserVariablePtr AnalyserEquation::external(size_t index) const
214+
AnalyserVariablePtr AnalyserEquation::externalVariable(size_t index) const
215215
{
216-
if (index >= mPimpl->mExternals.size()) {
216+
if (index >= mPimpl->mExternalVariables.size()) {
217217
return {};
218218
}
219219

220-
return mPimpl->mExternals[index];
220+
return mPimpl->mExternalVariables[index];
221221
}
222222

223223
} // namespace libcellml

‎src/analyserequation_p.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ struct AnalyserEquation::AnalyserEquationImpl
3838

3939
std::vector<AnalyserVariablePtr> mStates;
4040
std::vector<AnalyserVariablePtr> mComputedConstants;
41-
std::vector<AnalyserVariablePtr> mAlgebraic;
42-
std::vector<AnalyserVariablePtr> mExternals;
41+
std::vector<AnalyserVariablePtr> mAlgebraicVariables;
42+
std::vector<AnalyserVariablePtr> mExternalVariables;
4343

4444
std::vector<AnalyserVariablePtr> mConstantDependencies;
4545
std::vector<AnalyserEquationWeakPtr> mDependencies;

‎src/analysermodel.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,58 +177,58 @@ AnalyserVariablePtr AnalyserModel::computedConstant(size_t index) const
177177
return mPimpl->mComputedConstants[index];
178178
}
179179

180-
size_t AnalyserModel::algebraicCount() const
180+
size_t AnalyserModel::algebraicVariableCount() const
181181
{
182182
if (!isValid()) {
183183
return 0;
184184
}
185185

186-
return mPimpl->mAlgebraic.size();
186+
return mPimpl->mAlgebraicVariables.size();
187187
}
188188

189-
std::vector<AnalyserVariablePtr> AnalyserModel::algebraic() const
189+
std::vector<AnalyserVariablePtr> AnalyserModel::algebraicVariables() const
190190
{
191191
if (!isValid()) {
192192
return {};
193193
}
194194

195-
return mPimpl->mAlgebraic;
195+
return mPimpl->mAlgebraicVariables;
196196
}
197197

198-
AnalyserVariablePtr AnalyserModel::algebraic(size_t index) const
198+
AnalyserVariablePtr AnalyserModel::algebraicVariable(size_t index) const
199199
{
200-
if (!isValid() || (index >= mPimpl->mAlgebraic.size())) {
200+
if (!isValid() || (index >= mPimpl->mAlgebraicVariables.size())) {
201201
return {};
202202
}
203203

204-
return mPimpl->mAlgebraic[index];
204+
return mPimpl->mAlgebraicVariables[index];
205205
}
206206

207-
size_t AnalyserModel::externalCount() const
207+
size_t AnalyserModel::externalVariableCount() const
208208
{
209209
if (!isValid()) {
210210
return 0;
211211
}
212212

213-
return mPimpl->mExternals.size();
213+
return mPimpl->mExternalVariables.size();
214214
}
215215

216-
std::vector<AnalyserVariablePtr> AnalyserModel::externals() const
216+
std::vector<AnalyserVariablePtr> AnalyserModel::externalVariables() const
217217
{
218218
if (!isValid()) {
219219
return {};
220220
}
221221

222-
return mPimpl->mExternals;
222+
return mPimpl->mExternalVariables;
223223
}
224224

225-
AnalyserVariablePtr AnalyserModel::external(size_t index) const
225+
AnalyserVariablePtr AnalyserModel::externalVariable(size_t index) const
226226
{
227-
if (!isValid() || (index >= mPimpl->mExternals.size())) {
227+
if (!isValid() || (index >= mPimpl->mExternalVariables.size())) {
228228
return {};
229229
}
230230

231-
return mPimpl->mExternals[index];
231+
return mPimpl->mExternalVariables[index];
232232
}
233233

234234
AnalyserVariablePtr AnalyserModel::variable(const VariablePtr &variable)

‎src/analysermodel_p.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ struct AnalyserModel::AnalyserModelImpl
3838
std::vector<AnalyserVariablePtr> mStates;
3939
std::vector<AnalyserVariablePtr> mConstants;
4040
std::vector<AnalyserVariablePtr> mComputedConstants;
41-
std::vector<AnalyserVariablePtr> mAlgebraic;
42-
std::vector<AnalyserVariablePtr> mExternals;
41+
std::vector<AnalyserVariablePtr> mAlgebraicVariables;
42+
std::vector<AnalyserVariablePtr> mExternalVariables;
4343

4444
std::vector<AnalyserEquationPtr> mEquations;
4545

‎src/analyservariable.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ static const std::map<AnalyserVariable::Type, std::string> typeToString = {
7171
{AnalyserVariable::Type::STATE, "state"},
7272
{AnalyserVariable::Type::CONSTANT, "constant"},
7373
{AnalyserVariable::Type::COMPUTED_CONSTANT, "computed_constant"},
74-
{AnalyserVariable::Type::ALGEBRAIC, "algebraic"},
75-
{AnalyserVariable::Type::EXTERNAL, "external"}};
74+
{AnalyserVariable::Type::ALGEBRAIC_VARIABLE, "algebraic_variable"},
75+
{AnalyserVariable::Type::EXTERNAL_VARIABLE, "external_variable"}};
7676

7777
std::string AnalyserVariable::typeAsString(Type type)
7878
{

‎src/api/libcellml/analyserequation.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class LIBCELLML_EXPORT AnalyserEquation
230230
*
231231
* @return The number of algebraic variables.
232232
*/
233-
size_t algebraicCount() const;
233+
size_t algebraicVariableCount() const;
234234

235235
/**
236236
* @brief Get the algebraic variables computed by this @ref AnalyserEquation.
@@ -239,7 +239,7 @@ class LIBCELLML_EXPORT AnalyserEquation
239239
*
240240
* @return The algebraic variables as a @c std::vector.
241241
*/
242-
std::vector<AnalyserVariablePtr> algebraic() const;
242+
std::vector<AnalyserVariablePtr> algebraicVariables() const;
243243

244244
/**
245245
* @brief Get the algebraic variable, at @p index, computed by this @ref AnalyserEquation.
@@ -250,7 +250,7 @@ class LIBCELLML_EXPORT AnalyserEquation
250250
*
251251
* @return The algebraic variable, at @p index, on success, @c nullptr on failure.
252252
*/
253-
AnalyserVariablePtr algebraic(size_t index) const;
253+
AnalyserVariablePtr algebraicVariable(size_t index) const;
254254

255255
/**
256256
* @brief Get the number of external variables computed by this @ref AnalyserEquation.
@@ -259,7 +259,7 @@ class LIBCELLML_EXPORT AnalyserEquation
259259
*
260260
* @return The number of external variables.
261261
*/
262-
size_t externalCount() const;
262+
size_t externalVariableCount() const;
263263

264264
/**
265265
* @brief Get the external variables computed by this @ref AnalyserEquation.
@@ -268,7 +268,7 @@ class LIBCELLML_EXPORT AnalyserEquation
268268
*
269269
* @return The external variables as a @c std::vector.
270270
*/
271-
std::vector<AnalyserVariablePtr> externals() const;
271+
std::vector<AnalyserVariablePtr> externalVariables() const;
272272

273273
/**
274274
* @brief Get the external variable, at @p index, computed by this @ref AnalyserEquation.
@@ -279,7 +279,7 @@ class LIBCELLML_EXPORT AnalyserEquation
279279
*
280280
* @return The external variable, at @p index, on success, @c nullptr on failure.
281281
*/
282-
AnalyserVariablePtr external(size_t index) const;
282+
AnalyserVariablePtr externalVariable(size_t index) const;
283283

284284
private:
285285
AnalyserEquation(); /**< Constructor, @private. */

0 commit comments

Comments
 (0)