diff --git a/chapters/connectors.tex b/chapters/connectors.tex index e769ba89d..98f722647 100644 --- a/chapters/connectors.tex +++ b/chapters/connectors.tex @@ -844,7 +844,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabe end equalityConstraint; end Record; \end{lstlisting} -The \lstinline!residue! output of the \lstinline!equalityConstraint(..)! function shall have +The \lstinline!residue! output of the \lstinline!equalityConstraint! function shall have known size, say constant n. The function shall express the equality between the two type instances \lstinline!T1! and \lstinline!T2! or the record instances \lstinline!R1! and @@ -900,7 +900,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabe from the overdetermined type or record instance \lstinline!R! in connector instance \lstinline!A! to the corresponding overdetermined type or record instance \lstinline!R! in connector instance \lstinline!B! for a virtual connection graph. This function can -be used at all places where a \lstinline!connect(..)! statement is allowed. +be used at all places where a \lstinline!connect! statement is allowed. \par \begin{nonnormative*} E.g., it is not allowed to use this function in a when-clause. This definition shall be used if in a model with connectors \lstinline!A! and \lstinline!B! the overdetermined @@ -969,7 +969,7 @@ \subsection{Converting the Connection Graph into Trees and Generating Connection from the graph. This is performed in the following way: \begin{enumerate} \item - Every root node defined via the \lstinline!Connections.root(..)! statement is + Every root node defined via the \lstinline!Connections.root! statement is a definite root of one spanning tree. \item The virtual connection graph may consist of sets of subgraphs that are @@ -978,7 +978,7 @@ \subsection{Converting the Connection Graph into Trees and Generating Connection graph of this set does not contain any root node, then one potential root node in this subgraph that has the lowest priority number is selected to be the root of that subgraph. The selection can be - inquired in a class with function \lstinline!Connections.isRoot(..)!, see table + inquired in a class with function \lstinline!Connections.isRoot!, see table above. \item If there are n selected roots in a subgraph, then optional spanning-tree edges @@ -1062,7 +1062,7 @@ \subsubsection{An Overdetermined Connector for Power Systems}\doublelabel{an-ove end AC_Inductor \end{lstlisting} At the place where the source frequency, i.e., essentially -variable theta, is defined, a \lstinline!Connections.root(..)! must be present: +variable theta, is defined, a \lstinline!Connections.root! must be present: \begin{lstlisting}[language=modelica] AC_plug p; equation diff --git a/chapters/equations.tex b/chapters/equations.tex index 780adfd32..46f262f68 100644 --- a/chapters/equations.tex +++ b/chapters/equations.tex @@ -498,9 +498,9 @@ \subsection{assert}\doublelabel{assert} \lstinline!message! indicates the cause of the warning. \begin{nonnormative} It is recommended to report the warning only once when the condition becomes false, and it is reported that the condition is no longer - violated when the condition returns to true. The \lstinline!assert(..)! statement shall have no influence on the behavior of the model. + violated when the condition returns to true. The \lstinline!assert! statement shall have no influence on the behavior of the model. For example, by evaluating the condition and reporting the message only after accepted integrator steps. \lstinline!condition! needs to - be implicitly treated with \lstinline!noEvent(..)! since otherwise events might be triggered that can lead to slightly changed simulation results. + be implicitly treated with \lstinline!noEvent! since otherwise events might be triggered that can lead to slightly changed simulation results. \end{nonnormative} \end{itemize} @@ -750,7 +750,7 @@ \section{Initialization, initial equation, and initial algorithm}\doublelabel{in Before any operation is carried out with a Modelica model (e.g., simulation or linearization), initialization takes place to assign consistent values for all variables present in the model. During this -phase, also the derivatives, \lstinline!der(..)!, and the pre-variables, \lstinline!pre(..)!, +phase, also the derivatives (\lstinline!der!), and the pre-variables (\lstinline!pre!), are interpreted as unknown algebraic variables. The initialization uses all equations and algorithms that are utilized in the intended operation (such as simulation or linearization). The equations of a @@ -854,7 +854,7 @@ \section{Initialization, initial equation, and initial algorithm}\doublelabel{in A Modelica translator may first transform the continuous equations of a model, at least conceptually, to state space form. This may require to differentiate equations for index reduction, i.e., additional equations and, in some cases, additional unknown variables are introduced. This whole set of equations, together with the additional constraints -defined above, should lead to an algebraic system of equations where the number of equations and the number of all variables (including \lstinline!der(..)! and \lstinline!pre(..)! +defined above, should lead to an algebraic system of equations where the number of equations and the number of all variables (including \lstinline!der! and \lstinline!pre! variables) is equal. Often, this is a nonlinear system of equations and therefore it may be necessary to provide appropriate guess values (i.e., \lstinline!start! values and \lstinline!fixed=false!) in order to compute a solution numerically.