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

Timestamp:

Mar 18, 2020, 11:06:13 AM (4 years ago)

Author:

stuerze

Message:

upgrade to newmat11 library

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);
@@ -277 +280 @@
 }
 
-void GetSubMatrix::operator-=(const BaseMatrix& bmx)
-{
-   REPORT
-   Tracer tr("SubMatrix(-=)"); GeneralMatrix* gmx = 0;
+void GetSubMatrix::SP_eq(const BaseMatrix& bmx)
+{
+   REPORT
+   Tracer tr("SubMatrix(SP_eq)"); GeneralMatrix* gmx = 0;
    // MatrixConversionCheck mcc;         // Check for loss of info
    Try
@@ -287 +290 @@
       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);