Add new recipe_subset ctor, use it to clean up filter functions

CleverRaven · Jan 9, 2019 · a9cea01 · a9cea01
1 parent 74604c1
commit a9cea01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/src/recipe_dictionary.cpp b/src/recipe_dictionary.cpp
@@ -168,43 +168,30 @@ std::vector<const recipe *> recipe_subset::search( const std::string &txt,
 
     return res;
 }
-static void insert_vector( const recipe_subset &src, recipe_subset &dst,
-                           const std::vector<const recipe *> &recipes )
-{
+
+recipe_subset::recipe_subset( const recipe_subset &src, const std::vector<const recipe *> &recipes ) {
     for( const auto elem : recipes ) {
-        dst.include( elem, src.get_custom_difficulty( elem ) );
+        include( elem, src.get_custom_difficulty( elem ) );
     }
 }
 
 recipe_subset recipe_subset::reduce( const std::string &txt, const search_type key ) const
 {
-    recipe_subset result;
-
-    insert_vector( *this, result, search( txt, key ) );
-
-    return result;
+    return recipe_subset( *this, search( txt, key ) );
 }
 recipe_subset recipe_subset::intersection( const recipe_subset &subset ) const
 {
-    recipe_subset result;
-
     std::vector<const recipe *> intersection_result;
     std::set_intersection( this->begin(), this->end(), subset.begin(), subset.end(),
                            std::back_inserter( intersection_result ) );
-    insert_vector( *this, result, intersection_result );
-
-    return result;
+    return recipe_subset( *this, intersection_result );
 }
 recipe_subset recipe_subset::difference( const recipe_subset &subset ) const
 {
-    recipe_subset result;
-
     std::vector<const recipe *> difference_result;
     std::set_difference( this->begin(), this->end(), subset.begin(), subset.end(),
                          std::back_inserter( difference_result ) );
-    insert_vector( *this, result, difference_result );
-
-    return result;
+    return recipe_subset( *this, difference_result );
 }
 
 std::vector<const recipe *> recipe_subset::search_result( const itype_id &item ) const

diff --git a/src/recipe_dictionary.h b/src/recipe_dictionary.h
@@ -66,6 +66,8 @@ extern recipe_dictionary recipe_dict;
 class recipe_subset
 {
     public:
+        recipe_subset( void ) = default;
+        recipe_subset( const recipe_subset &src, const std::vector<const recipe *> &recipes );
         /**
          * Include a recipe to the subset.
          * @param r recipe to include