issue #1300: renamed isTriu --> istriu

casadi · Jun 29, 2015 · d903171 · d903171
1 parent cd4540c
commit d903171
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/casadi/core/matrix/generic_matrix.hpp b/casadi/core/matrix/generic_matrix.hpp
@@ -126,7 +126,7 @@ namespace casadi {
     bool isrow() const { return sparsity().isVector();}
 
     /** \brief Check if the matrix is upper triangular */
-    bool isTriu() const { return sparsity().isTriu();}
+    bool istriu() const { return sparsity().istriu();}
 
     /** \brief Check if the matrix is lower triangular */
     bool istril() const { return sparsity().istril();}

diff --git a/casadi/core/matrix/matrix.hpp b/casadi/core/matrix/matrix.hpp
@@ -160,7 +160,7 @@ namespace casadi {
     using B::isDense;
     using B::isVector;
     using B::istril;
-    using B::isTriu;
+    using B::istriu;
     using B::colind;
     using B::row;
     using B::dimString;

diff --git a/casadi/core/matrix/matrix_impl.hpp b/casadi/core/matrix/matrix_impl.hpp
@@ -2348,7 +2348,7 @@ namespace casadi {
         }
       }
       return x;
-    } else if (isTriu()) {
+    } else if (istriu()) {
       // backward substitution if upper triangular
       Matrix<DataType> x = b;
       const int*  Arow = row();

diff --git a/casadi/core/matrix/sparsity.cpp b/casadi/core/matrix/sparsity.cpp
@@ -271,8 +271,8 @@ namespace casadi {
     return (*this)->istril();
   }
 
-  bool Sparsity::isTriu() const {
-    return (*this)->isTriu();
+  bool Sparsity::istriu() const {
+    return (*this)->istriu();
   }
 
   Sparsity Sparsity::sub(const std::vector<int>& rr, const Sparsity& sp,

diff --git a/casadi/core/matrix/sparsity.hpp b/casadi/core/matrix/sparsity.hpp
@@ -577,7 +577,7 @@ namespace casadi {
     bool isSymmetric() const;
 
     /// Is upper triangular?
-    bool isTriu() const;
+    bool istriu() const;
 
     /// Is lower triangular?
     bool istril() const;

diff --git a/casadi/core/matrix/sparsity_internal.cpp b/casadi/core/matrix/sparsity_internal.cpp
@@ -3771,7 +3771,7 @@ namespace casadi {
     return true;
   }
 
-  bool SparsityInternal::isTriu() const {
+  bool SparsityInternal::istriu() const {
     const int* colind = this->colind();
     const int* row = this->row();
     // loop over columns

diff --git a/casadi/core/matrix/sparsity_internal.hpp b/casadi/core/matrix/sparsity_internal.hpp
@@ -285,7 +285,7 @@ namespace casadi {
     bool istril() const;
 
     /// is upper triangular?
-    bool isTriu() const;
+    bool istriu() const;
 
     /// Get upper triangular part
     Sparsity zz_triu(bool includeDiagonal) const;

diff --git a/docs/users_guide/casadi-users_guide.tex b/docs/users_guide/casadi-users_guide.tex
@@ -664,7 +664,7 @@ \section{Querying properties}
   \item[\emph{A}.isScalar()] Is the matrix a scalar, i.e. having dimensions 1-by-1?
   \item[\emph{A}.isVector()] Is the matrix a vector, i.e. having dimensions $n$-by-1?
   \item[\emph{A}.isSquare()] Is the matrix square?
-  \item[\emph{A}.isTriu()] Is the matrix upper triangular?
+  \item[\emph{A}.istriu()] Is the matrix upper triangular?
   \item[\emph{A}.isConstant()] Are the matrix entries all constant?
   \item[\emph{A}.isInteger()] Are the matrix entries all integer-valued?
 \end{description}