diff --git a/chapters/annotations.tex b/chapters/annotations.tex index f350b3044..8b2dba38f 100644 --- a/chapters/annotations.tex +++ b/chapters/annotations.tex @@ -359,10 +359,10 @@ \subsubsection{Coordinate Systems}\doublelabel{coordinate-systems} {[}\emph{a first quadrant coordinate system}{]}. The attribute \lstinline!preserveAspectRatio! specifies a hint for the shape of -components of the class, but does not actually influence the rendering of the component. +components of the class, but does not actually influence the rendering of the component. If \lstinline!preserveAspectRatio! is true, changing the extent of components should preserve the current aspect ratio of the coordinate -system of the class. +system of the class. The attribute \lstinline!initialScale! specifies the default component size as \lstinline!initialScale! times the size of the coordinate system of the class. An @@ -822,7 +822,7 @@ \subsubsection{Text}\doublelabel{text} \begin{itemize} \item \%\emph{par} and \%\{\emph{par\}} replaced by the value of the - parameter \emph{par}. + parameter \emph{par}. If the value is numeric, tools shall display the value with displayUnit, formatted according to bipm-specification. E.g., for \lstinline!parameter Real t(unit="s",displayUnit="ms")=0.1! tools shall display \lstinline!100 ms!. The intent is that the text is easily readable, @@ -1127,7 +1127,7 @@ \section{Annotations for the Graphical User Interface}\doublelabel{annotations-f It indicates that the class ideally should not be used anymore and gives a message indicating the recommended action. This annotation is not inherited, the assumption is that if a class uses -an obsolete class (as a base-class or as the class of one of the components) +an obsolete class (as a base-class or as the class of one of the components) that shall be updated - ideally without impacting users of the class. If that is not possible the current class can have also have an obsolete-annotation. diff --git a/chapters/arrays.tex b/chapters/arrays.tex index e34c14f5d..05b5447f8 100644 --- a/chapters/arrays.tex +++ b/chapters/arrays.tex @@ -40,7 +40,7 @@ \section{Array Declarations}\doublelabel{array-declarations} built-in type classes Real, Integer, Boolean, String, and enumeration types. The type of a dimension upper bound expression, e.g. n, m, p,... in the table below, need to be a subtype of Integer or EB for a class EB -that is an enumeration type or subtype of the Boolean type. +that is an enumeration type or subtype of the Boolean type. Colon (:) indicates that the dimension upper bound is unknown and is a subtype of diff --git a/chapters/classes.tex b/chapters/classes.tex index 128164167..b09d07c33 100644 --- a/chapters/classes.tex +++ b/chapters/classes.tex @@ -191,8 +191,8 @@ \subsection{Component Declaration Static Semantics}\doublelabel{component-declar \end{itemize} in that order. -Array dimensions shall be scalar non-negative parameter expressions of type Integer, -a reference to a type (which must an enumeration type or Boolean, see \autoref{enumeration-types}), +Array dimensions shall be scalar non-negative parameter expressions of type Integer, +a reference to a type (which must an enumeration type or Boolean, see \autoref{enumeration-types}), or the colon operator denoting that the array dimension is left unspecified (see \autoref{array-declarations}). All variants can also be part of short class definitions. @@ -202,7 +202,7 @@ \subsection{Component Declaration Static Semantics}\doublelabel{component-declar model ArrayVariants type T=Real[:]; // Unspecified size for type parameter T x=ones(4); - parameter T y[3]=ones(3, 4); + parameter T y[3]=ones(3, 4); parameter Real a[2]=ones(2); // Specified using Integer parameter Real b[2, 0]=ones(2, 0); // Size 0 is allowed parameter Real c[:]=ones(0); // Unspecified size for variable diff --git a/chapters/derivationofstream.tex b/chapters/derivationofstream.tex index 5f7fca560..7586111c1 100644 --- a/chapters/derivationofstream.tex +++ b/chapters/derivationofstream.tex @@ -172,7 +172,7 @@ \subsection{Connection of 3 stream connectors where one mass flow rate is identi This case occurs, when a one-port sensor (like a temperature sensor) is connected to two connected components. For the sensor, the min attribute of the mass flow rate should be set to zero (no fluid exiting the -component via this connector). +component via this connector). This simplification (and similar ones) can also be used if a tool determines that a mass flow rate is zero or non-negative. It is also possible to generalize this to the case where more than one sensor is connected. The suggested implementation results in diff --git a/chapters/equations.tex b/chapters/equations.tex index bb8b55eb1..0c23b684c 100644 --- a/chapters/equations.tex +++ b/chapters/equations.tex @@ -577,19 +577,19 @@ \section{Synchronous Data-flow Principle and Single Assignment Rule}\doublelabel \begin{enumerate} \item Discrete variables keep their actual values until these variables are explicitly changed. -Differentiated variables have \lstinline!der(x)! corresponding to the time-derivative of \lstinline!x!, -and \lstinline!x! is continuous, except when reinit is triggered - see \autoref{reinit}. +Differentiated variables have \lstinline!der(x)! corresponding to the time-derivative of \lstinline!x!, +and \lstinline!x! is continuous, except when reinit is triggered - see \autoref{reinit}. Variable values can be accessed at any time instant during continuous integration and at event instants. -\item At every time instant, during continuous integration and at event instants, +\item At every time instant, during continuous integration and at event instants, the equations express relations between variables which have to be fulfilled concurrently.. \item Computation and communication at an event instant does not take time. {[}\emph{If computation or communication time has to be simulated, this property has to be explicitly modeled}{]}. -\item There must exist a perfect matching of variables to equations after flattening -(perfect matching rule - previously called single assignment rule); +\item There must exist a perfect matching of variables to equations after flattening +(perfect matching rule - previously called single assignment rule); see also globally balanced \autoref{balanced-models}. \end{enumerate} diff --git a/chapters/functions.tex b/chapters/functions.tex index 7308ce387..2fb649dfe 100644 --- a/chapters/functions.tex +++ b/chapters/functions.tex @@ -1738,9 +1738,9 @@ \section{External Function Interface}\doublelabel{external-function-interface} is treated the same way as a top-level input or output in the external call. -If the function has \lstinline!annotation(Include="includeDirective")!, \autoref{annotations-for-external-libraries-and-include-files} +If the function has \lstinline!annotation(Include="includeDirective")!, \autoref{annotations-for-external-libraries-and-include-files} it is assumed that it contains an actual prototype and no prototype shall be automatically generated. -In that case the input argument pointers shall be const pointers (indicating that they do not modify the inputs), +In that case the input argument pointers shall be const pointers (indicating that they do not modify the inputs), and non-const pointers are deprecated. The optional external-function-call is still used for determining the name of the function, and order of arguments, as described below.