Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Connector equations #2486

Merged
merged 3 commits into from
Feb 17, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions chapters/classes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -817,9 +817,7 @@ \section{Specialized Classes}\doublelabel{specialized-classes}
of a record may not have prefixes \lstinline!input!, \lstinline!output!,
\lstinline!inner!, \lstinline!outer!, \lstinline!stream,!
or \lstinline!flow!. Enhanced with implicitly available record constructor function,
see \autoref{record-constructor-functions}. Additionally, record components can be used as
component references in expressions and in the left hand side of
assignments, subject to normal type compatibility rules. The components
see \autoref{record-constructor-functions}. The components
directly declared in a record may only be of specialized class record
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"record and type" should probably be "record or type".

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, done!

and type.\\ \hline
\lstinline!type! & May only be predefined types, enumerations, array of
Expand Down Expand Up @@ -877,6 +875,12 @@ \section{Specialized Classes}\doublelabel{specialized-classes}
\end{lstlisting}
{]}\\ \hline
\end{longtable}
Additionally only components of specialized classes \lstinline!record!, \lstinline!type!, \lstinline!operator record!, and
svorkoetter marked this conversation as resolved.
Show resolved Hide resolved
connector classes based on any of those can be used as component references in normal expressions and in the left hand
side of assignments, subject to normal type compatibility rules.
Additionally components of connectors may be arguments of connect-statements,
and any component can be used as argument to the \lstinline!ndims! and \lstinline!size!-functions, or for accessing
elements of that component (possibly in combination with array indexing).

{[}\emph{Example for ''operator'': }
\begin{lstlisting}[language=modelica]
Expand Down
5 changes: 4 additions & 1 deletion chapters/connectors.tex
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ \section{Restrictions of Connections and Connectors}\doublelabel{restrictions-of

\subsection{Balancing Restriction and Size of Connectors}\doublelabel{balancing-restriction-and-size-of-connectors}

For each non-partial connector class the number of flow variables shall
For each non-partial non-expandable connector class the number of flow variables shall
be equal to the number of variables that are neither \lstinline!parameter!,
\lstinline!constant!, \lstinline!input!, \lstinline!output!, \lstinline!stream!
nor \lstinline!flow!. The ``number of variables'' is
Expand All @@ -742,6 +742,9 @@ \subsection{Balancing Restriction and Size of Connectors}\doublelabel{balancing-
variables of an overdetermined type or record class (see \autoref{overconstrained-equation-operators-for-connection-graphs})
is the size of the output argument of the corresponding
\lstinline!equalityConstraint!() function.
\begin{nonnormative}
Expandable connector classes are excluded from this, since their component declarations are only a form of constraints.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"constraints" -> "constraint".

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

\end{nonnormative}

{[}\emph{Examples:}

Expand Down