|
@@ -123,7 +123,7 @@ TYPE
|
|
|
|
|
|
(** Monadic Operators - do not overwrite the argument *)
|
|
|
(** Negative *)
|
|
|
- PROCEDURE "-"*( x: Array ): Array;
|
|
|
+ OPERATOR "-"*( x: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; minus: Array;
|
|
|
BEGIN
|
|
|
IF x # NIL THEN
|
|
@@ -137,7 +137,7 @@ TYPE
|
|
|
END "-";
|
|
|
|
|
|
(** Complex Conjugate *)
|
|
|
- PROCEDURE "~"*( x: Array ): Array;
|
|
|
+ OPERATOR "~"*( x: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; cc: Array;
|
|
|
BEGIN
|
|
|
IF x # NIL THEN
|
|
@@ -151,12 +151,12 @@ TYPE
|
|
|
END "~";
|
|
|
|
|
|
(** Dyadic Operators *)
|
|
|
- PROCEDURE ":="*( VAR l: Array; r: Value );
|
|
|
+ OPERATOR ":="*( VAR l: Array; r: Value );
|
|
|
BEGIN
|
|
|
IF l # NIL THEN Fill( r, l^, 0, 0, LEN( l[0] ), LEN( l ) ); ELSE DataErrors.Error( "The supplied instance of Array2dRe.Array was NIL." ) END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; r: Array2dRe.Array );
|
|
|
+ OPERATOR ":="*( VAR l: Array; r: Array2dRe.Array );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -172,7 +172,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; r: Array2dRat.Array );
|
|
|
+ OPERATOR ":="*( VAR l: Array; r: Array2dRat.Array );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -188,7 +188,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; r: Array2dInt.Array );
|
|
|
+ OPERATOR ":="*( VAR l: Array; r: Array2dInt.Array );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -204,7 +204,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrCplx.Complex );
|
|
|
+ OPERATOR ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrCplx.Complex );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
rows := LEN( r, 0 ); cols := LEN( r, 1 );
|
|
@@ -217,7 +217,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrRe.Real );
|
|
|
+ OPERATOR ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrRe.Real );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
rows := LEN( r, 0 ); cols := LEN( r, 1 );
|
|
@@ -230,7 +230,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrRat.Rational );
|
|
|
+ OPERATOR ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrRat.Rational );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
rows := LEN( r, 0 ); cols := LEN( r, 1 );
|
|
@@ -243,7 +243,7 @@ TYPE
|
|
|
END
|
|
|
END ":=";
|
|
|
|
|
|
- PROCEDURE ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrInt.Integer );
|
|
|
+ OPERATOR ":="*( VAR l: Array; VAR r: ARRAY OF ARRAY OF NbrInt.Integer );
|
|
|
VAR i, k, cols, rows: NbrInt.Integer;
|
|
|
BEGIN
|
|
|
rows := LEN( r, 0 ); cols := LEN( r, 1 );
|
|
@@ -257,7 +257,7 @@ TYPE
|
|
|
END ":=";
|
|
|
|
|
|
(** Arithmetic. Operators do not overwrite the arguments. *)
|
|
|
- PROCEDURE "+"*( l, r: Array ): Array;
|
|
|
+ OPERATOR "+"*( l, r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -273,7 +273,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -289,7 +289,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -305,7 +305,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -321,7 +321,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -337,7 +337,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -353,7 +353,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "+"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
+ OPERATOR "+"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; sum: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -369,7 +369,7 @@ TYPE
|
|
|
RETURN sum
|
|
|
END "+";
|
|
|
|
|
|
- PROCEDURE "-"*( l, r: Array ): Array;
|
|
|
+ OPERATOR "-"*( l, r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -385,7 +385,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -401,7 +401,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -417,7 +417,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -433,7 +433,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -449,7 +449,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -465,7 +465,7 @@ TYPE
|
|
|
RETURN diff
|
|
|
END "-";
|
|
|
|
|
|
- PROCEDURE "-"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
+ OPERATOR "-"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; diff: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -482,7 +482,7 @@ TYPE
|
|
|
END "-";
|
|
|
|
|
|
(** Array dot products *)
|
|
|
- PROCEDURE "*"*( l, r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l, r: Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -502,7 +502,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array2dRe.Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -522,7 +522,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array2dRe.Array; r: Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -542,7 +542,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array2dRat.Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -562,7 +562,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array2dRat.Array; r: Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -582,7 +582,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array2dInt.Array ): Array;
|
|
|
VAR i, j, k, cols, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -602,7 +602,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: Array2dInt.Array; r: Array ): Array;
|
|
|
(** Caution: Use brackets to ensure proper matrix multiplication when contracting three or more matrices,
|
|
|
e.g., A*(B*C) is correct, whereas A*B*C is not. This is because matrix multiplician is from right to left;
|
|
|
whereas, the Oberon programming languages multiplies from left to right. *)
|
|
@@ -626,7 +626,7 @@ TYPE
|
|
|
END "*";
|
|
|
|
|
|
(** Array-Array contractions, returns x = A v or x[i] = A[i, k] v[k] *)
|
|
|
- PROCEDURE "*"*( l: Array; r: Array1dCplx.Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array1dCplx.Array ): Array1dCplx.Array;
|
|
|
VAR i, k, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -644,7 +644,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array1dRe.Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array1dRe.Array ): Array1dCplx.Array;
|
|
|
VAR i, k, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -662,7 +662,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array1dRat.Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array1dRat.Array ): Array1dCplx.Array;
|
|
|
VAR i, k, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -680,7 +680,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: Array1dInt.Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: Array1dInt.Array ): Array1dCplx.Array;
|
|
|
VAR i, k, dummy, rows: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -699,7 +699,7 @@ TYPE
|
|
|
END "*";
|
|
|
|
|
|
(** Array-Array contractions, returns x = ATv = vTA or x[i] = A[k, i] v[k] = v[k] A[k, i] *)
|
|
|
- PROCEDURE "*"*( l: Array1dCplx.Array; r: Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array1dCplx.Array; r: Array ): Array1dCplx.Array;
|
|
|
VAR i, k, cols, dummy: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -717,7 +717,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array1dRe.Array; r: Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array1dRe.Array; r: Array ): Array1dCplx.Array;
|
|
|
VAR i, k, cols, dummy: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -735,7 +735,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array1dRat.Array; r: Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array1dRat.Array; r: Array ): Array1dCplx.Array;
|
|
|
VAR i, k, cols, dummy: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -753,7 +753,7 @@ TYPE
|
|
|
RETURN dot
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array1dInt.Array; r: Array ): Array1dCplx.Array;
|
|
|
+ OPERATOR "*"*( l: Array1dInt.Array; r: Array ): Array1dCplx.Array;
|
|
|
VAR i, k, cols, dummy: NbrInt.Integer; sum: NbrCplx.Complex; dot: Array1dCplx.Array;
|
|
|
BEGIN
|
|
|
IF (l # NIL ) & (r # NIL ) THEN
|
|
@@ -772,7 +772,7 @@ TYPE
|
|
|
END "*";
|
|
|
|
|
|
(** Scalar multiplications *)
|
|
|
- PROCEDURE "*"*( l: NbrCplx.Complex; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: NbrCplx.Complex; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; prod: Array;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -785,7 +785,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: NbrCplx.Complex ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: NbrCplx.Complex ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; prod: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -798,7 +798,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: NbrRe.Real; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: NbrRe.Real; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; left: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -811,7 +811,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: NbrRe.Real ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: NbrRe.Real ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -824,7 +824,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: NbrRat.Rational; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: NbrRat.Rational; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; left: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -837,7 +837,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: NbrRat.Rational ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: NbrRat.Rational ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -850,7 +850,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: NbrInt.Integer; r: Array ): Array;
|
|
|
+ OPERATOR "*"*( l: NbrInt.Integer; r: Array ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; left: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF r # NIL THEN
|
|
@@ -863,7 +863,7 @@ TYPE
|
|
|
RETURN prod
|
|
|
END "*";
|
|
|
|
|
|
- PROCEDURE "*"*( l: Array; r: NbrInt.Integer ): Array;
|
|
|
+ OPERATOR "*"*( l: Array; r: NbrInt.Integer ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; prod: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -877,7 +877,7 @@ TYPE
|
|
|
END "*";
|
|
|
|
|
|
(** Scalar divisions *)
|
|
|
- PROCEDURE "/"*( l: Array; r: NbrCplx.Complex ): Array;
|
|
|
+ OPERATOR "/"*( l: Array; r: NbrCplx.Complex ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; div: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -893,7 +893,7 @@ TYPE
|
|
|
RETURN div
|
|
|
END "/";
|
|
|
|
|
|
- PROCEDURE "/"*( l: Array; r: NbrRe.Real ): Array;
|
|
|
+ OPERATOR "/"*( l: Array; r: NbrRe.Real ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; div: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -910,7 +910,7 @@ TYPE
|
|
|
RETURN div
|
|
|
END "/";
|
|
|
|
|
|
- PROCEDURE "/"*( l: Array; r: NbrRat.Rational ): Array;
|
|
|
+ OPERATOR "/"*( l: Array; r: NbrRat.Rational ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; div: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|
|
@@ -927,7 +927,7 @@ TYPE
|
|
|
RETURN div
|
|
|
END "/";
|
|
|
|
|
|
- PROCEDURE "/"*( l: Array; r: NbrInt.Integer ): Array;
|
|
|
+ OPERATOR "/"*( l: Array; r: NbrInt.Integer ): Array;
|
|
|
VAR i, k, cols, rows: NbrInt.Integer; right: NbrCplx.Complex; div: Array;
|
|
|
BEGIN
|
|
|
IF l # NIL THEN
|