updates

Author: jonathan-beard

raftinc/kernel_pair_t.hpp

@@ -56,17 +56,14 @@ namespace raft
 class kernel_pair_t
 {
     /** container with ref wrapper **/ 
-    template < class CONTAINER > using kernel_pair_t_base = 
-        CONTAINER< std::reference_wrapper< raft::kernel > > >;
-    /** instantiation of vector as that container type **/
-    using kernel_pair_t_container = kernel_pair_t_base< std::vector >;
-    
+    using kernel_pair_t_container  = 
+        std::vector< std::reference_wrapper< raft::kernel> >;
 
 public:
     /**
      * define iterator type publicly 
      */
-    using kernel_iterator_type = typename kernel_pair_t_container::iterator_type;
+    using kernel_iterator_type = kernel_pair_t_container::iterator;
     /** 
      * endpoint ret type is a std::pair with
      * two iterators, one for begin, the second 
@@ -119,31 +116,31 @@ class kernel_pair_t
      * to end();
      * @return endpoint_ret_type
      */
-    endpoint_ret_type getSrc();
+    kernel_pair_t::endpoint_ret_type getSrc();
     /**
      * getSrcSize - returns the size of the source
      * container. This is the number of kernels
      * within the last map addition.
      * @return size_type - number of kernels in source
      *                     container
      */
-    size_type         getSrcSize() noexcept; 
+    kernel_pair_t::size_type         getSrcSize() noexcept; 
     /**
      * getDst - return a std::pair object with iterators
      * to the dst list of kernels added in the last map 
      * addition. Again, pair.first maps ot begin(), and 
      * pair.second maps to end();
      * @return endpoint_ret_type
      */
-    endpoint_ret_type getDst();
+    kernel_pair_t::endpoint_ret_type getDst();
     /**
      * getDstSize - returns the size of the destination
      * container. This is the number of kernels
      * within the last map addition.
      * @return size_type - number of kernels in source
      *                     container
      */
-    size_type         getDstSize() noexcept;
+    kernel_pair_t::size_type         getDstSize() noexcept;
     /**
      * addSrc - add a source kernel to this pair object
      * which is retreivable by the getSrc. If this object

src/kernel_pair_t.cpp

@@ -13,3 +13,48 @@ kernel_pair_t::kernel_pair_t( raft::kernel * const src,
     source.emplace_back( *src );
     destination.emplace_back( *dst );
 }
+
+
+kernel_pair_t::kernel_pair_t( raft::kernel &src,
+                              raft::kernel &dst ) : kernel_pair_t()
+{
+    source.emplace_back( &src );
+    destination.emplace_back( dst );
+}
+
+kernel_pair_t::endpoint_ret_type
+kernel_pair_t::getSrc()
+{
+    return( endpoint_ret_type( source.begin(), source.end() ) );
+}
+
+kernel_pair_t::size_type
+kernel_pair_t::getSrcSize() noexcept
+{
+    return( source.size() );
+}
+
+
+kernel_pair_t::endpoint_ret_type
+kernel_pair_t::getDst()
+{
+    return( endpoint_ret_type( destination.begin(), destination.end() ) );
+}
+
+kernel_pair_t::size_type
+kernel_pair_t::getDstSize() noexcept
+{
+    return( destination.size() );
+}
+
+void
+kernel_pair_t::addSrc( raft::kernel &k ) noexcept
+{
+    source.emplace_back( k );
+}
+
+void
+kernel_pair_t::addDst( raft::kernel &k ) noexcept
+{
+    destination.emplace_back( k );
+}