Changeset 2990

Timestamp:

07/02/08 06:39:29 (2 months ago)

Author:

dumas

Message:

added Generic trait for iterators without value_type (typically X*)

Location:

trunk/linbox/linbox/matrix

Files:

• sparse.h (modified) (2 diffs)
• sparse.inl (modified) (1 diff)

trunk/linbox/linbox/matrix/sparse.h

@@ -557 +557 @@
                 { return ConstRawIterator (_A.end (), _A.back ().end (), _A.end ()); }
 
+
+
+        /* Generic trait for iterators without type */
+    template<typename U>
+    struct IteratorValueType {
+        typedef typename U::value_type value_type;
+    };
+    
+    template<typename X>
+    struct IteratorValueType<const X*> {
+        typedef X value_type;
+    };
+
+        /* Generic trait for iterators without type */
+
+
+
         template <class RepIterator, class RowIdxIterator>
         class _RawIndexedIterator
@@ -563 +580 @@
 //              // typedef std::pair<size_t, size_t> value_type;
 //              typedef typename RowIdxIterator/*::value_type*/::second_type value_type;
-                typedef typename RowIdxIterator::value_type::second_type value_type;
+//              typedef typename RowIdxIterator::value_type::second_type value_type;
+            typedef typename IteratorValueType< RowIdxIterator >::value_type::second_type value_type;
 
                 _RawIndexedIterator (size_t idx, const RepIterator &i, const RowIdxIterator &j, const RepIterator &A_end)

trunk/linbox/linbox/matrix/sparse.inl

@@ -711 +711 @@
         ::setEntry (size_t i, size_t j, const Element &value) 
 {
+        typedef typename Row::value_type value_type;
         Row &v = _A[i];
         typename Row::iterator iter;
-
+        
         if (v.size () == 0) {
-                v.push_back (std::pair <size_t, Element> (j, value));                
+                v.push_back ( value_type(j, value));                
         } else {
                 iter = std::lower_bound (v.begin (), v.end (), j, VectorWrapper::CompareSparseEntries<Element> ());
 
                 if (iter == v.end () || iter->first != j)
-                        iter = v.insert (iter, std::pair <size_t, Element> (j, value));
+                        iter = v.insert (iter, value_type(j, value));
                 else
                         iter->second = value;