Merge pull request #54 from msoeken/assignment

Assignment operator.

Author: msoeken

docs/changelog.rst

@@ -10,6 +10,9 @@ v0.5 (not yet released)
 * Type traits: ``is_truth_table``
   `#53 <https://github.com/msoeken/kitty/pull/53>`_
 
+* Assignment operator for truth tables
+  `#54 <https://github.com/msoeken/kitty/pull/54>`_
+
 v0.4 (May 4, 2018)
 ------------------
 

docs/truth_table_data_structures.rst

@@ -40,6 +40,8 @@ following public member functions.
 +-----------------------------------+----------------------------------------------------------------------------------+
 | ``crend()``                       | Constant reverse end iterator to bits.                                           |
 +-----------------------------------+----------------------------------------------------------------------------------+
+| ``operator=(other)``              | Assignment operator.                                                             |
++-----------------------------------+----------------------------------------------------------------------------------+
 | ``mask_bits()``                   | Masks the number of valid truth table bits.                                      |
 +-----------------------------------+----------------------------------------------------------------------------------+
 
@@ -89,6 +91,8 @@ following public member functions.
 +--------------------------+---------------------------------------------------------------------------------+
 | ``crend()``              | Constant reverse end iterator to bits.                                          |
 +--------------------------+---------------------------------------------------------------------------------+
+| ``operator=(other)``     | Assignment operator.                                                            |
++--------------------------+---------------------------------------------------------------------------------+
 | ``mask_bits()``          | Masks the number of valid truth table bits.                                     |
 +--------------------------+---------------------------------------------------------------------------------+
 

include/kitty/dynamic_truth_table.hpp

@@ -33,9 +33,11 @@
 #pragma once
 
 #include <cstdint>
+#include <type_traits>
 #include <vector>
 
 #include "detail/constants.hpp"
+#include "traits.hpp"
 
 namespace kitty
 {
@@ -128,6 +130,28 @@ struct dynamic_truth_table
    */
   inline auto crend() const noexcept { return _bits.crend(); }
 
+  /*! \brief Assign other truth table.
+
+    This replaces the current truth table with another truth table.  The truth
+    table type is arbitrary.  The vector of bits is resized accordingly.
+
+    \param other Other truth table
+  */
+  template<class TT, typename = std::enable_if_t<is_truth_table<TT>::value>>
+  dynamic_truth_table& operator=( const TT& other )
+  {
+    _bits.resize( other.num_blocks() );
+    std::copy( other.begin(), other.end(), begin() );
+    _num_vars = other.num_vars();
+
+    if ( _num_vars < 6 )
+    {
+      mask_bits();
+    }
+
+    return *this;
+  }
+
   /*! Masks the number of valid truth table bits.
 
     If the truth table has less than 6 variables, it may not use all
@@ -148,4 +172,7 @@ struct dynamic_truth_table
   int _num_vars;
   /*! \endcond */
 };
+
+template<>
+struct is_truth_table<kitty::dynamic_truth_table> : std::true_type {};
 } // namespace kitty

include/kitty/static_truth_table.hpp

@@ -36,6 +36,7 @@
 #include <cstdint>
 
 #include "detail/constants.hpp"
+#include "traits.hpp"
 
 namespace kitty
 {
@@ -120,6 +121,25 @@ struct static_truth_table<NumVars, true>
    */
   inline auto crend() const noexcept { return ( &_bits ) + 1; }
 
+  /*! \brief Assign other truth table if number of variables match.
+
+    This replaces the current truth table with another truth table, if `other`
+    has the same number of variables.  Otherwise, the truth table is not
+    changed.
+
+    \param other Other truth table
+  */
+  template<class TT, typename = std::enable_if_t<is_truth_table<TT>::value>>
+  static_truth_table<NumVars>& operator=( const TT& other )
+  {
+    if ( other.num_vars() == num_vars() )
+    {
+      std::copy( other.begin(), other.end(), begin() );
+    }
+
+    return *this;
+  }
+
   /*! Masks the number of valid truth table bits.
 
     If the truth table has less than 6 variables, it may not use all
@@ -220,6 +240,25 @@ struct static_truth_table<NumVars, false>
    */
   inline auto crend() const noexcept { return _bits.crend(); }
 
+  /*! \brief Assign other truth table if number of variables match.
+
+    This replaces the current truth table with another truth table, if `other`
+    has the same number of variables.  Otherwise, the truth table is not
+    changed.
+
+    \param other Other truth table
+  */
+  template<class TT, typename = std::enable_if_t<is_truth_table<TT>::value>>
+  static_truth_table<NumVars>& operator=( const TT& other )
+  {
+    if ( other.num_vars() == num_vars() )
+    {
+      std::copy( other.begin(), other.end(), begin() );
+    }
+
+    return *this;
+  }
+
   /*! Masks the number of valid truth table bits.
 
     We know that we will have at least 7 variables in this data
@@ -232,4 +271,8 @@ struct static_truth_table<NumVars, false>
   std::array<uint64_t, NumBlocks> _bits;
   /*! \endcond */
 };
+
+template<int NumVars>
+struct is_truth_table<kitty::static_truth_table<NumVars>> : std::true_type {};
+
 } // namespace kitty

include/kitty/traits.hpp

@@ -34,19 +34,10 @@
 
 #include <type_traits>
 
-#include "dynamic_truth_table.hpp"
-#include "static_truth_table.hpp"
-
 namespace kitty
 {
 
 template<class TT>
 struct is_truth_table : std::false_type {};
 
-template<>
-struct is_truth_table<kitty::dynamic_truth_table> : std::true_type {};
-
-template<int NumVars>
-struct is_truth_table<kitty::static_truth_table<NumVars>> : std::true_type {};
-
 }

test/operations.cpp

@@ -746,3 +746,38 @@ TEST_F( OperationsTest, majority_odd_conjecture )
 
   EXPECT_EQ( maj, ternary_majority( nth<n>( n - 1 ), f1_e, f2_e ) );
 }
+
+TEST_F( OperationsTest, copy_truth_tables )
+{
+  kitty::dynamic_truth_table tt1( 3 ), tt2( 7 );
+  kitty::static_truth_table<3> tt3;
+  kitty::static_truth_table<7> tt4;
+
+  kitty::create_random( tt1 );
+  kitty::create_random( tt2 );
+  kitty::create_random( tt3 );
+  kitty::create_random( tt4 );
+
+  kitty::dynamic_truth_table tt;
+
+  tt = tt1;
+  EXPECT_EQ( tt, tt1 );
+  tt = tt2;
+  EXPECT_EQ( tt, tt2 );
+  tt = tt3;
+  EXPECT_TRUE( std::equal( tt.begin(), tt.end(), tt3.begin() ) );
+  tt = tt4;
+  EXPECT_TRUE( std::equal( tt.begin(), tt.end(), tt4.begin() ) );
+
+  static_truth_table<3> tt_s3;
+  tt_s3 = tt1;
+  EXPECT_TRUE( std::equal( tt_s3.begin(), tt_s3.end(), tt1.begin() ) );
+  tt_s3 = tt3;
+  EXPECT_EQ( tt_s3, tt3 );
+
+  static_truth_table<7> tt_s7;
+  tt_s7 = tt2;
+  EXPECT_TRUE( std::equal( tt_s7.begin(), tt_s7.end(), tt2.begin() ) );
+  tt_s7 = tt4;
+  EXPECT_EQ( tt_s7, tt4 );
+}