Changeset 9434 in ntrip for trunk/BNC/newmat/submat.cpp

Timestamp:

May 19, 2021, 1:32:38 PM (3 years ago)

Author:

stuerze

Message:

newmat is reverted to its stable version 10 because version 11beta was not working with mac compilers

File:

• trunk/BNC/newmat/submat.cpp (modified) (3 diffs)

trunk/BNC/newmat/submat.cpp

@@ -257 +257 @@
       if (row_number != gmx->Nrows() || col_number != gmx->Ncols())
          Throw(IncompatibleDimensionsException());
-      if (gm->type().is_symmetric() && 
-         ( ! gmx->type().is_symmetric() || row_skip != col_skip) )
-         Throw(ProgramException("Illegal operation on symmetric"));
       MatrixRow mrx(gmx, LoadOnEntry);
       MatrixRow mr(gm, LoadOnEntry+StoreOnExit+DirectPart, row_skip);
@@ -280 +277 @@
 }
 
-void GetSubMatrix::SP_eq(const BaseMatrix& bmx)
-{
-   REPORT
-   Tracer tr("SubMatrix(SP_eq)"); GeneralMatrix* gmx = 0;
+void GetSubMatrix::operator-=(const BaseMatrix& bmx)
+{
+   REPORT
+   Tracer tr("SubMatrix(-=)"); GeneralMatrix* gmx = 0;
    // MatrixConversionCheck mcc;         // Check for loss of info
    Try
@@ -290 +287 @@
       if (row_number != gmx->Nrows() || col_number != gmx->Ncols())
          Throw(IncompatibleDimensionsException());
-      if (gm->type().is_symmetric() && 
-         ( ! gmx->type().is_symmetric() || row_skip != col_skip) )
-         Throw(ProgramException("Illegal operation on symmetric"));
-      MatrixRow mrx(gmx, LoadOnEntry);
-      MatrixRow mr(gm, LoadOnEntry+StoreOnExit+DirectPart, row_skip);
-                                     // do need LoadOnEntry
-      MatrixRowCol sub; int i = row_number;
-      while (i--)
-      {
-         mr.SubRowCol(sub, col_skip, col_number);   // put values in sub
-         sub.Multiply(mrx); mr.Next(); mrx.Next();
-      }
-      gmx->tDelete();
-   }
-
-   CatchAll
-   {
-      if (gmx) gmx->tDelete();
-      ReThrow;
-   }
-}
-
-void GetSubMatrix::operator-=(const BaseMatrix& bmx)
-{
-   REPORT
-   Tracer tr("SubMatrix(-=)"); GeneralMatrix* gmx = 0;
-   // MatrixConversionCheck mcc;         // Check for loss of info
-   Try
-   {
-      SetUpLHS(); gmx = ((BaseMatrix&)bmx).Evaluate();
-      if (row_number != gmx->Nrows() || col_number != gmx->Ncols())
-         Throw(IncompatibleDimensionsException());
-      if (gm->type().is_symmetric() && 
-         ( ! gmx->type().is_symmetric() || row_skip != col_skip) )
-         Throw(ProgramException("Illegal operation on symmetric"));
       MatrixRow mrx(gmx, LoadOnEntry);
       MatrixRow mr(gm, LoadOnEntry+StoreOnExit+DirectPart, row_skip);