Skip to content

Commit

Permalink
Remove hyphen in "sub-set"
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikt-ma committed Mar 18, 2021
1 parent 2dc313d commit bc525bf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 2 additions & 4 deletions chapters/equations.tex
Original file line number Diff line number Diff line change
Expand Up @@ -926,10 +926,8 @@ \subsection{The Number of Equations Needed for Initialization}\label{the-number-

\subsection{Recommended selection of start-values}\label{recommended-selection-of-start-values}

In general many variables have start-values that are not fixed and
selecting a sub-set of these can give a consistent set of start-values
close to the user-expectations. The following gives a non-normative
procedure for finding such a sub-set.
In general many variables have start-values that are not fixed and selecting a subset of these can give a consistent set of start-values close to the user-expectations.
The following gives a non-normative procedure for finding such a subset.

\begin{nonnormative}
A model has a hierarchical component structure. Each component
Expand Down
4 changes: 2 additions & 2 deletions chapters/functions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ \section{Declaring Inverses of Functions}\label{declaring-inverses-of-functions}
This requires that $f_2$ is such that, if $u_k$ is calculated as \lstinline!$u_k$ := $f_2$($\ldots$, y, $\ldots$)!, the equality \lstinline!y = $f_1$($\ldots$, $u_k$, $\ldots$)! is satisfied up to a certain precision, for all valid values of the input arguments of \lstinline!$f_2$($\ldots$, y, $\ldots$)!.

Function $f_1$ can have any number and types of formal parameters with and without default value.
The restriction is that the \emph{number of unknown variables} (see \cref{balanced-models}) in the output formal parameter of both $f_1$ and $f_2$ must be the same and that $f_2$ should have a union of output and formal parameters that is the same or a sub-set of that union for $f_1$, but the order of the formal parameters may be permuted.
The restriction is that the \emph{number of unknown variables} (see \cref{balanced-models}) in the output formal parameter of both $f_1$ and $f_2$ must be the same and that $f_2$ should have a union of output and formal parameters that is the same or a subset of that union for $f_1$, but the order of the formal parameters may be permuted.

\begin{example}
Same union of variables:
Expand All @@ -1595,7 +1595,7 @@ \section{Declaring Inverses of Functions}\label{declaring-inverses-of-functions}
\end{lstlisting}
\end{example}

The sub-set case is useful if $f_1$ computes the inverse of $f_2$ within a region, or up to a certain tolerance.
The subset case is useful if $f_1$ computes the inverse of $f_2$ within a region, or up to a certain tolerance.
Then, $f_1$ may specify $f_2$ as inverse with fewer arguments, skipping the arguments for tolerance and/or the region.

\begin{example}
Expand Down
2 changes: 1 addition & 1 deletion chapters/syntax.tex
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ \section{Lexical conventions}\label{lexical-conventions}
Modelica also has structured comments in the form of annotations and string comments.
\item
Each description-string or string in annotations (= \lstinline[language=grammar]!STRING! with production annotation-clause in the grammar) may contain any member of the Unicode character set.
All other strings have to contain only the sub-set of Unicode characters identical with the 7-bit US-ASCII character set.
All other strings have to contain only the subset of Unicode characters identical with the 7-bit US-ASCII character set.
\begin{nonnormative}
As a consequence, operators like `\lstinline!>!' or `\lstinline!<!', and external functions only operate on ASCII strings and not on Unicode-strings.
Within a description-string the tags \lstinline!<HTML>! and \lstinline!</HTML>! or \lstinline!<html>! and \lstinline!</html>! define optionally begin and end of content that is HTML encoded.
Expand Down

0 comments on commit bc525bf

Please sign in to comment.