Skip to content

Commit

Permalink
Spell checking
Browse files Browse the repository at this point in the history
  • Loading branch information
perost committed Apr 21, 2020
1 parent 4ddd3d1 commit 88821f4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/BackEnd/Causalize.mo
Expand Up @@ -33,7 +33,7 @@ encapsulated package Causalize
" file: Causalize.mo
package: Causalize
description: Causalize contains functions to causalize the equation system.
This includes algorithms to check if the system is singulare,
This includes algorithms to check if the system is singular,
match the equations with variables and sorting to BLT-Form."


Expand Down
16 changes: 8 additions & 8 deletions OMCompiler/Compiler/BackEnd/IndexReduction.mo
Expand Up @@ -166,7 +166,7 @@ public function failIfIndexReduction "author: lochel
input output array<Integer> inAssignments2;
input output BackendDAE.StructurallySingularSystemHandlerArg inArg;
algorithm
Error.addCompilerError("Structural singular system detected, but no index reduction method has been selected.");
Error.addCompilerError("Structurally singular system detected, but no index reduction method has been selected.");
fail();
end failIfIndexReduction;

Expand Down Expand Up @@ -357,7 +357,7 @@ algorithm
stateindxs := List.fold2(unassignedEqns, statesInEquations, (m, statemark, 0), inAssignments1, {});
((unassignedEqns, eqnslst, discEqns)) := List.fold3(unassignedEqns, unassignedContinuesEqns, vars, inAssignments2, m, ({}, {}, {}));
b := intGe(listLength(stateindxs), listLength(unassignedEqns));
singulareSystemError(b, stateindxs, unassignedEqns, eqnslst, syst, shared, inAssignments1, inAssignments2, inArg);
singularSystemError(b, stateindxs, unassignedEqns, eqnslst, syst, shared, inAssignments1, inAssignments2, inArg);
// check each mss
(outEqnsLst, outStateIndxs, outunassignedEqns, discEqns) := minimalStructurallySingularSystemMSS(inEqnsLst, syst, shared, inAssignments1, inAssignments2, inArg, statemark, 1, m, vars, {}, {}, {}, {});
end minimalStructurallySingularSystem;
Expand Down Expand Up @@ -400,13 +400,13 @@ algorithm
stateIndxs := List.fold2(ilst, statesInEquations, (m, statemark, mark), inAssignments1, {});
// print("stateIndxs " + stringDelimitList(List.map(stateIndxs, intString), ", ") + "\n");
b := intGe(listLength(stateIndxs), listLength(unassignedEqns));
singulareSystemError(b, stateIndxs, unassignedEqns, eqnsLst, inSystem, inShared, inAssignments1, inAssignments2, inArg);
singularSystemError(b, stateIndxs, unassignedEqns, eqnsLst, inSystem, inShared, inAssignments1, inAssignments2, inArg);
(outEqnsLst, outStateIndxs, outUnassEqnsAcc, outDiscEqns) := minimalStructurallySingularSystemMSS(rest, inSystem, inShared, inAssignments1, inAssignments2, inArg, statemark, mark+1, m, vars, eqnsLst::inEqnsLstAcc, stateIndxs::inStateIndxsAcc, unassignedEqns::inUnassEqnsAcc, discEqns);
then (outEqnsLst, outStateIndxs, outUnassEqnsAcc, outDiscEqns);
end match;
end minimalStructurallySingularSystemMSS;

protected function singulareSystemError "author: Frenkel TUD 2012-04
protected function singularSystemError "author: Frenkel TUD 2012-04
Index Reduction algorithm to get a index 1 or 0 system."
input Boolean b;
input list<Integer> unassignedStates;
Expand Down Expand Up @@ -448,15 +448,15 @@ algorithm

case (false, _::_, (_, _, _, mapIncRowEqn, _)) equation
if Flags.isSet(Flags.BLT_DUMP) then
print("Reduce Index failed! System is structurally singulare and cannot be handled because number of unassigned continuous equations is larger than number of states.\nmarked equations:\n");
print("Reduce Index failed! System is structurally singular and cannot be handled because the number of unassigned continuous equations is larger than the number of states.\nmarked equations:\n");
// get from scalar eqns indexes the indexes in the equation array
BackendDump.debuglst(eqns, intString, " ", "\n");
end if;
eqns1 = List.map1r(eqns, arrayGet, mapIncRowEqn);
eqns1 = List.uniqueIntN(eqns1, arrayLength(mapIncRowEqn));
if Flags.isSet(Flags.BLT_DUMP) then
print(BackendDump.dumpMarkedEqns(inSystem, eqns1));
print("\n\nunassgined states:\n");
print("\n\nunassigned states:\n");
end if;
varlst = List.map1r(unassignedStates, BackendVariable.getVarAt, BackendVariable.daeVars(inSystem));
if Flags.isSet(Flags.BLT_DUMP) then
Expand All @@ -466,10 +466,10 @@ algorithm
if Flags.isSet(Flags.BLT_DUMP) then
BackendDump.printBackendDAE(BackendDAE.DAE({syst}, inShared));
end if;
Error.addMessage(Error.INTERNAL_ERROR, {"IndexReduction.pantelidesIndexReduction failed! System is structurally singulare and cannot handled because number of unassigned equations is larger than number of states. Use -d=bltdump to get more information."});
Error.addMessage(Error.INTERNAL_ERROR, {"IndexReduction.pantelidesIndexReduction failed! System is structurally singular and cannot be handled because the number of unassigned equations is larger than the number of states. Use -d=bltdump to get more information."});
then fail();
end match;
end singulareSystemError;
end singularSystemError;

protected function unassignedContinuesEqns
"author: Frenkel TUD - 2012-11,
Expand Down
Expand Up @@ -22,7 +22,7 @@ getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PantelidesSingular', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = "Failed to build model: PantelidesSingular"
// end SimulationResult;
// "Error: Internal error IndexReduction.pantelidesIndexReduction failed! System is structurally singulare and cannot handled because number of unassigned equations is larger than number of states. Use -d=bltdump to get more information.
// "Error: Internal error IndexReduction.pantelidesIndexReduction failed! System is structurally singular and cannot be handled because the number of unassigned equations is larger than the number of states. Use -d=bltdump to get more information.
// Error: Internal error Transformation Module PFPlusExt index Reduction Method Pantelides failed!
// "
// endResult
Expand Up @@ -19,7 +19,7 @@ getErrorString();
// simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'SingularPlanarLoop', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
// messages = "Failed to build model: SingularPlanarLoop"
// end SimulationResult;
// "Error: Internal error IndexReduction.pantelidesIndexReduction failed! System is structurally singulare and cannot handled because number of unassigned equations is larger than number of states. Use -d=bltdump to get more information.
// "Error: Internal error IndexReduction.pantelidesIndexReduction failed! System is structurally singular and cannot be handled because the number of unassigned equations is larger than the number of states. Use -d=bltdump to get more information.
// Error: Internal error Transformation Module PFPlusExt index Reduction Method Pantelides failed!
// "
// endResult

0 comments on commit 88821f4

Please sign in to comment.