Skip to content

Commit

Permalink
FixTypos
Browse files Browse the repository at this point in the history
  • Loading branch information
@HansOlsson
HansOlsson committed Jun 20, 2022
1 parent 7295b76 commit 2b60adb
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
52 changes: 26 additions & 26 deletions chapters/arrays.tex
View file
Expand Up @@ -72,7 +72,7 @@ \section{Array Declarations}\label{array-declarations}
\hline
{\lstinline!C x!}; & {\lstinline!C x!}; & $0$ & Scalar & Scalar\\
{\lstinline!C[$n$] x;!} & {\lstinline!C x[$n$];!} & $1$ & Vector & $n$-vector\\
{\lstinline!C[EB] x;!} & {\lstinline!C x[EB]!} & $1$ & Vector & Vector indexed by {\lstinlineEB!}\\
{\lstinline!C[EB] x;!} & {\lstinline!C x[EB]!} & $1$ & Vector & Vector indexed by {\lstinline!EB!}\\
{\lstinline!C[$n$, $m$] x;!} & {\lstinline!C x[$n$, $m$];!} & $2$ & Matrix & $n \times m$ matrix\\
{\lstinline!C[$n_1$, $n_{2}$, $\ldots$, $n_k$] x;!} &
{\lstinline!C x[$n_{1}$, $n_{2}$, $\ldots$, $n_{k}$];!} & $k$ & Array & General array\\
Expand Down Expand Up @@ -137,7 +137,7 @@ \section{Array Declarations}\label{array-declarations}
\tablehead{Modelica form 1} & \tablehead{Modelica form 2} & \tablehead{\# dims} & \tablehead{Designation} & \tablehead{Explanation}\\
\hline
\hline
{\lstinline!C[1] x;!} & {\lstinline1C x[1];!} & $1$ & Vector & 1-vector, representing a scalar\\
{\lstinline!C[1] x;!} & {\lstinline!C x[1];!} & $1$ & Vector & 1-vector, representing a scalar\\
{\lstinline!C[1, 1] x;!} & {\lstinline!C x[1, 1];!} & $2$ & Matrix & $(1 \times 1)$-matrix, representing a scalar\\
{\lstinline!C[$n$, 1] x;!} & {\lstinline!C x[$n$, 1];!} & $2$ & Matrix & $(n \times 1)$-matrix, representing a column\\
{\lstinline!C[1, $n$] x;!} & {\lstinline!C x[1, $n$];!} & $2$ & Matrix & $(1 \times n)$-matrix, representing a row\\
Expand Down Expand Up @@ -1160,10 +1160,10 @@ \subsection{Element-wise Multiplication}\label{array-element-wise-multiplication
\tablehead{Operation \lstinline!c := s * a! or \lstinline!c := a * s!}\\
\hline
\hline
Scalar & Scalar & Scalar & \lstinline!c := s * a!\\
Scalar & $n$-vector & $n$-vector & \lstinline!c[$j$] := s * a[$j$]!\\
Scalar & $n \times m$ matrix & $n \times m$ matrix & \lstinline!c[$j$, $k$] := s * a[$j$, $k$]!\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := s * a[$j$, $k$, $\ldots$]!\\
Scalar & Scalar & Scalar & {\lstinline!c := s * a!}\\
Scalar & $n$-vector & $n$-vector & {\lstinline!c[$j$] := s * a[$j$]!}\\
Scalar & $n \times m$ matrix & $n \times m$ matrix & {\lstinline!c[$j$, $k$] := s * a[$j$, $k$]!}\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := s * a[$j$, $k$, $\ldots$]!}\\
\hline
\end{tabular}
\end{center}
Expand All @@ -1181,10 +1181,10 @@ \subsection{Element-wise Multiplication}\label{array-element-wise-multiplication
\tablehead{Operation} \lstinline!c := a .* b!\\
\hline
\hline
Scalar & Scalar & Scalar & \lstinline!c := a * b!\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a * b[$j$, $k$, $\ldots$]!\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] * b!\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] * b[$j$, $k$, $\ldots$]!\\
Scalar & Scalar & Scalar & {\lstinline!c := a * b!}\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a * b[$j$, $k$, $\ldots$]!}\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] * b!}\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] * b[$j$, $k$, $\ldots$]!}\\
\hline
\end{tabular}
\end{center}
Expand All @@ -1202,10 +1202,10 @@ \subsection{Multiplication of Matrices and Vectors}\label{matrix-and-vector-mult
\tablehead{Operation \lstinline!c := a * b!}\\
\hline
\hline
$m$-vector & $m$-vector & Scalar & \lstinline!c := $\sum_{k}$ a[$k$] * b[$k$]!\\
$m$-vector & $m \times n$ matrix & $n$-vector & \lstinline!c[$j$] := $\sum_{k}$ a[$k$] * b[$k$, $j$]!\\
$l \times m$ matrix & $m$-vector & $l$-vector & \lstinline!c[$i$] := $\sum_{k}$ a[$i$, $k$] * b[$k$]!\\
$l \times m$ matrix & $m \times n$ matrix & $l \times n$ matrix & \lstinline!c[$i$, $j$] := $\sum_{k}$ a[$i$, $k$] * b[$k$, $j$]!\\
$m$-vector & $m$-vector & Scalar & {\lstinline!c := $\sum_{k}$ a[$k$] * b[$k$]!}\\
$m$-vector & $m \times n$ matrix & $n$-vector & {\lstinline!c[$j$] := $\sum_{k}$ a[$k$] * b[$k$, $j$]!}\\
$l \times m$ matrix & $m$-vector & $l$-vector & {\lstinline!c[$i$] := $\sum_{k}$ a[$i$, $k$] * b[$k$]!}\\
$l \times m$ matrix & $m \times n$ matrix & $l \times n$ matrix & {\lstinline!c[$i$, $j$] := $\sum_{k}$ a[$i$, $k$] * b[$k$, $j$]!}\\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -1236,10 +1236,10 @@ \subsection{Division by Numeric Scalars}\label{division-by-numeric-scalars}
\tablehead{Operation \lstinline!c := a / s!}\\
\hline
\hline
Scalar & Scalar & Scalar & \lstinline!c := a / s!\\
$n$-vector & Scalar & $n$-vector & \lstinline!c[$k$] := a[$k$] / s!\\
$n \times m$ matrix & Scalar & $n \times m$ matrix & \lstinline!c[$j$, $k$] := a[$j$, $k$] / s!\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / s!\\
Scalar & Scalar & Scalar & {\lstinline!c := a / s!}\\
$n$-vector & Scalar & $n$-vector & {\lstinline!c[$k$] := a[$k$] / s!}\\
$n \times m$ matrix & Scalar & $n \times m$ matrix & {\lstinline!c[$j$, $k$] := a[$j$, $k$] / s!}\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / s!}\\
\hline
\end{tabular}
\end{center}
Expand All @@ -1260,10 +1260,10 @@ \subsection{Element-wise Division}\label{array-element-wise-division}\label{elem
\tablehead{Operation} \lstinline!c := a ./ b!\\
\hline
\hline
Scalar & Scalar & Scalar & \lstinline!c := a / b!\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a / b[$j$, $k$, $\ldots$]!\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / b!\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / b[$j$, $k$, $\ldots$]!\\
Scalar & Scalar & Scalar & {\lstinline!c := a / b!}\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a / b[$j$, $k$, $\ldots$]!}\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / b!}\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] / b[$j$, $k$, $\ldots$]!}\\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -1297,10 +1297,10 @@ \subsection{Element-wise Exponentiation}\label{element-wise-exponentiation}
\tablehead{Operation} \lstinline!c := a .^ b!\\
\hline
\hline
Scalar & Scalar & Scalar & \lstinline!c := a ^ b!\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a ^ b[$j$, $k$, $\ldots$]!\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] ^ b!\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & \lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] ^ b[$j$, $k$, $\ldots$]!\\
Scalar & Scalar & Scalar & {\lstinline!c := a ^ b!}\\
Scalar & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a ^ b[$j$, $k$, $\ldots$]!}\\
$n \times m \times \ldots$ & Scalar & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] ^ b!}\\
$n \times m \times \ldots$ & $n \times m \times \ldots$ & $n \times m \times \ldots$ & {\lstinline!c[$j$, $k$, $\ldots$] := a[$j$, $k$, $\ldots$] ^ b[$j$, $k$, $\ldots$]!}\\
\hline
\end{tabular}
\end{center}
Expand Down
8 changes: 4 additions & 4 deletions chapters/functions.tex
View file
Expand Up @@ -2007,9 +2007,9 @@ \subsubsection{Simple Types}\label{simple-types}
\hline
{\lstinline!Real!} & {\lstinline[language=C]!double!} & {\lstinline[language=C]!double *!}\\
{\lstinline!Integer!} & {\lstinline[language=C]!int!} & {\lstinline[language=C]!int *!}\\
{\lstinline!Boolean!} & {\lstinline[language=C]!}int!} & \lstinline[language=C]!}int *!}\\
{\lstinline!String!} & {\lstinline[language=C]!const char *!} & \lstinline[language=C]!const char **!}\\
Enumeration type & {\lstinline[language=C]!int!} & \lstinline[language=C]!int *!}\\
{\lstinline!Boolean!} & {\lstinline[language=C]!int!} & {\lstinline[language=C]!int *!}\\
{\lstinline!String!} & {\lstinline[language=C]!const char *!} & {\lstinline[language=C]!const char **!}\\
Enumeration type & {\lstinline[language=C]!int!} & {\lstinline[language=C]!int *!}\\
\hline
\end{tabular}
\end{center}
Expand Down Expand Up @@ -2281,7 +2281,7 @@ \subsection{Return Type Mapping}\label{return-type-mapping}
{\lstinline!Integer!} & {\lstinline[language=C]!int!} & {\lstinline[language=FORTRAN77]!INTEGER!}\\
{\lstinline!Boolean!} & {\lstinline[language=C]!int!} & {\lstinline[language=FORTRAN77]!LOGICAL!}\\
{\lstinline!String!} & {\lstinline[language=C]!const char*!} & \emph{Not allowed}\\
{\lstinline!T[$\mathit{dim}_{1}$, $\ldots$, $\mathit{dim}_{n}$]! & \emph{Not allowed} & \emph{Not allowed} \\
{\lstinline!T[$\mathit{dim}_{1}$, $\ldots$, $\mathit{dim}_{n}$]!} & \emph{Not allowed} & \emph{Not allowed} \\
Enumeration type & {\lstinline[language=C]!int!} & {\lstinline[language=FORTRAN77]!INTEGER!}\\
Record & See \cref{records} & \emph{Not allowed}\\
\hline
Expand Down

0 comments on commit 2b60adb

Please sign in to comment.