index_list

docs/changelog.rst

@@ -39,8 +39,9 @@ v0.2 (not yet released)
     - Write networks to DIMACS files for CNF (`write_dimacs`) `#146 <https://github.com/lsils/mockturtle/pull/146>`_
     - Read BLIF files using *lorina* (`blif_reader`) `#167 <https://github.com/lsils/mockturtle/pull/167>`_
     - Write networks to BLIF files (`write_blif`) `#169 <https://github.com/lsils/mockturtle/pull/169>`_ `#184 <https://github.com/lsils/mockturtle/pull/184>`_
-    - Create circuit from integer index list (`create_from_binary_index_list`) `#259 <https://github.com/lsils/mockturtle/pull/259>`_
     - Write networks to AIGER files (`write_aiger`) `#379 <https://github.com/lsils/mockturtle/pull/379>`_
+* Utils
+    - Create circuit from integer index list (`encode`, `decode`, `insert`, `to_index_list_string`) `#385 <https://github.com/lsils/mockturtle/pull/385>`_
 * Resynthesis functions:
     - Resynthesis function based on DSD decomposition (`dsd_resynthesis`) `#182 <https://github.com/lsils/mockturtle/pull/182>`_
     - Resynthesis function based on Shannon decomposition (`shannon_resynthesis`) `#185 <https://github.com/lsils/mockturtle/pull/185>`_

include/mockturtle/algorithms/node_resynthesis/xag_minmc2.hpp

@@ -38,7 +38,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "../../io/index_list.hpp"
+#include "../../utils/index_list.hpp"
 #include "../../networks/xag.hpp"
 #include "../detail/minmc_xags.hpp"
 #include "../equivalence_classes.hpp"
@@ -126,7 +126,15 @@ class xag_minmc_resynthesis
     }
 
     const auto f = apply_spectral_transformations( ntk, trans, std::vector<signal<Ntk>>( begin, end ), [&]( xag_network& ntk, std::vector<signal<Ntk>> const& leaves ) {
-      return create_from_binary_index_list( ntk, it->second.begin(), leaves.begin() )[0u];
+      xag_index_list il{it->second};
+      std::vector<xag_network::signal> pos;
+      insert( ntk, std::begin( leaves ), std::begin( leaves ) + il.num_pis(), il,
+              [&]( xag_network::signal const& f )
+              {
+                pos.push_back( f );
+              } );
+      assert( pos.size() == 1u );
+      return pos[0u];
     } );
 
     fn( f );
@@ -142,6 +150,7 @@ class xag_minmc_resynthesis
       for ( auto const& [_, word, repr, expr] : detail::minmc_xags[i] )
       {
         (void)_;
+        (void)expr;
         db_[i][word] = repr;
         st_.db_size += sizeof( word ) + sizeof( repr ) + sizeof( uint32_t ) * repr.size();
       }

include/mockturtle/algorithms/node_resynthesis/xag_npn.hpp

@@ -44,8 +44,8 @@
 #include <kitty/static_truth_table.hpp>
 
 #include "../../algorithms/simulation.hpp"
-#include "../../io/index_list.hpp"
 #include "../../networks/xag.hpp"
+#include "../../utils/index_list.hpp"
 #include "../../utils/node_map.hpp"
 #include "../../utils/stopwatch.hpp"
 
@@ -210,7 +210,7 @@ class xag_npn_resynthesis
   {
     stopwatch t( st.time_db );
 
-    _db = create_from_binary_index_list<DatabaseNtk>( subgraphs );
+    decode( _db, xag_index_list{std::vector<uint32_t>{subgraphs, subgraphs + sizeof subgraphs / sizeof subgraphs[0]}} );
     const auto sim_res = simulate_nodes<kitty::static_truth_table<4u>>( _db );
 
     _db.foreach_node( [&]( auto n ) {