source: trunk/dports/math/mtl/files/patch @ 21489

Last change on this file since 21489 was 21489, checked in by eridius@…, 13 years ago

Massive update to svn properties on files:
All patchfiles have svn:eol-style removed.
All files that are not in fact able to be executed have svn:executable removed
All binary files have svn:eol-style removed (and are probably corrupt)
All binary files have svn:mime-type set to application/octet-stream
All files which are not patchfiles or binary files have svn:eol-style set to native
All Portfiles have svn:eol-style set to native and svn:executable removed

File size: 5.7 KB
  • contrib/examples/banded_view_test.cc

    diff -aur contrib/examples/banded_view_test.cc contrib/examples/banded_view_test.cc
     
    1515  print_all_matrix(A);
    1616  std::cout << std::endl;
    1717 
    18   typedef rows_type<Matrix>::type RowMatrix;
     18  typedef typename rows_type<Matrix>::type RowMatrix;
    1919 
    2020  std::cout << "rows banded" << std::endl;
    2121//begin
    22   band_view<RowMatrix>::type B(2, 1, A);
     22  typename band_view<RowMatrix>::type B(2, 1, A);
    2323//end
    2424  print_all_banded(B, 2, 1);
    2525  print_row(B);
    2626  std::cout << std::endl;
    2727
    2828  std::cout << "columns banded" << std::endl;
    29   typedef columns_type<Matrix>::type ColMatrix;
    30   band_view<ColMatrix>::type C(2, 1, columns(A));
     29  typedef typename columns_type<Matrix>::type ColMatrix;
     30  typename band_view<ColMatrix>::type C(2, 1, columns(A));
    3131  print_all_banded(C, 2, 1);
    3232  print_column(C);
    3333  std::cout << std::endl;
    3434
    3535  std::cout << "rows lower triangle" << std::endl;
    36   triangle_view<RowMatrix, lower>::type L(A);
     36  typename triangle_view<RowMatrix, lower>::type L(A);
    3737  print_all_banded(L, M-1, 0);
    3838  print_row(L);
    3939  std::cout << std::endl;
    4040
    4141  std::cout << "rows unit upper triangle" << std::endl;
    42   triangle_view<RowMatrix, unit_upper>::type U(A);
     42  typename triangle_view<RowMatrix, unit_upper>::type U(A);
    4343  print_all_banded(U, -1, N-1);
    4444  print_row(U);
    4545
    4646
    4747  std::cout << "columns lower triangle" << std::endl;
    48   triangle_view<ColMatrix, lower>::type CL(columns(A));
     48  typename triangle_view<ColMatrix, lower>::type CL(columns(A));
    4949  print_all_banded(CL, M-1, 0);
    5050  print_column(CL);
    5151  std::cout << std::endl;
    5252
    5353  std::cout << "columns unit upper triangle" << std::endl;
    54   triangle_view<ColMatrix, unit_upper>::type CU(columns(A));
     54  typename triangle_view<ColMatrix, unit_upper>::type CU(columns(A));
    5555  print_all_banded(CU, -1, N-1);
    5656  print_column(CU);
    5757//begin
  • mtl/dimension.h

    diff -aur mtl/dimension.h mtl/dimension.h
     
    3535  inline dimension(size_type m_, size_type n_) : m(m_), n(n_) { }
    3636  inline dimension& operator=(const dimension& x) {
    3737    m = x.m; n = x.n; return *this; }
    38   inline size_type first() const { return M ? M : m; }
    39   inline size_type second() const { return N ? N : n; }
     38  inline size_type first() const { return M ? (size_type)M : m; }
     39  inline size_type second() const { return N ? (size_type)N : n; }
    4040  inline bool is_static() const { return M != 0; }
    4141  inline transpose_type transpose() const { return transpose_type(n, m); }
    4242  /* protected: */
  • mtl/external_vector.h

    diff -aur mtl/external_vector.h mtl/external_vector.h
     
    7474    return data_[n]; }
    7575
    7676  // Size Methods
    77   inline size_type size() const { return N ? N : size_; }
     77  inline size_type size() const { return N ? (size_type)N : size_; }
    7878  inline void set_size(size_type n) { size_ = n; }
    7979
    8080  // Memory Access
  • mtl/linalg_vec.h

    diff -aur mtl/linalg_vec.h mtl/linalg_vec.h
     
    515515  /* Size Methods */
    516516  //: The size of the vector
    517517  //!wheredef: Container
    518   inline size_type size() const { return N ? N : size_; }
     518  inline size_type size() const { return N ? (size_type)N : size_; }
    519519
    520520  //: The number of non-zeroes in the vector
    521521  //!wheredef: Vector
  • mtl/matrix_implementation.h

    diff -aur mtl/matrix_implementation.h mtl/matrix_implementation.h
     
    939939template<class Matrix>
    940940inline typename rows_type<Matrix>::type
    941941rows(const Matrix& A) {
    942   return rows_type<Matrix>::type(A, do_strided());
     942  return typename rows_type<Matrix>::type(A, do_strided());
    943943}
    944944
    945945//: Access the column-wise view of the matrix
     
    954954template<class Matrix>
    955955inline typename columns_type<Matrix>::type
    956956columns(const Matrix& A) {
    957   return columns_type<Matrix>::type(A, do_strided());
     957  return typename columns_type<Matrix>::type(A, do_strided());
    958958}
    959959
    960960//: Swap the orientation of a matrix.
  • mtl/mtl.h

    diff -aur mtl/mtl.h mtl/mtl.h
     
    139139void
    140140scale_dim(Vector& x, const T& alpha, oned_tag)
    141141{
    142   oned_scale(x, alpha, dim_n<Vector>::RET());
     142  oned_scale(x, alpha, typename dim_n<Vector>::RET());
    143143}
    144144
    145145template <class Matrix, class T>
     
    233233inline typename linalg_traits<Vector>::magnitude_type
    234234one_norm(const Vector& x, oned_tag)
    235235{
    236   return oned_one_norm(x, dim_n<Vector>::RET());
     236  return oned_one_norm(x, typename dim_n<Vector>::RET());
    237237}
    238238
    239239
     
    285285inline typename linalg_traits<Vector>::magnitude_type
    286286two_norm(const Vector& x)
    287287{
    288   return oned_two_norm(x, dim_n<Vector>::RET());
     288  return oned_two_norm(x, typename dim_n<Vector>::RET());
    289289}
    290290
    291291//: add square
     
    29932993  MTL_ASSERT(x.size() <= y.size(), "mtl::ele_mult()");
    29942994  MTL_ASSERT(x.size() <= z.size(), "mtl::ele_mult()");
    29952995
    2996   ele_mult(x, y, z, dim_n<VecX>::RET());
     2996  ele_mult(x, y, z, typename dim_n<VecX>::RET());
    29972997}
    29982998
    29992999
     
    30703070swap(VecX& x, VecY& y, oned_tag) MTL_THROW_ASSERTION
    30713071{
    30723072  MTL_ASSERT(x.size() <= y.size(), "mtl::swap()");
    3073   swap(x, y, dim_n<VecX>::RET());
     3073  swap(x, y, typename dim_n<VecX>::RET());
    30743074
    30753075
    30763076
     
    31433143inline T
    31443144dot(const VecX& x, const VecY& y, T s, dense_tag, dense_tag)
    31453145{
    3146   return dot(x, y, s, dim_n<VecX>::RET());
     3146  return dot(x, y, s, typename dim_n<VecX>::RET());
    31473147}
    31483148
    31493149template <class InputIterator1, class InputIterator2, class T>
Note: See TracBrowser for help on using the repository browser.