Merge pull request #12 from iamtheburd/further-optimize-memory

Tyler Burdsall · web-flow · commit fb787db993c2 · 2018-12-26T16:39:35.000-08:00
Further optimize memory
diff --git a/src/boost_functions.cpp b/src/boost_functions.cpp
@@ -86,8 +86,7 @@ const void parse_args(const generation_args &args)
             }
             else
             {
-                set<uint1024_t> range = lazy_cartesian_product::boost_generate_random_indices(args.sample_size, max_size);
-                generate_random_samples(range, args);
+                generate_random_samples(max_size, args);
             }
             exit(0);
         }
@@ -99,7 +98,7 @@ const void parse_args(const generation_args &args)
     }
 }
 
-const void generate_random_samples(const set<uint1024_t> &range, const generation_args &args)
+const void generate_random_samples(const uint1024_t &max_size, const generation_args &args)
 {
     if (!args.display_json)
     {
@@ -112,16 +111,16 @@ const void generate_random_samples(const set<uint1024_t> &range, const generatio
     {
         cout << "[\n";
     }
-    set<uint1024_t>::const_iterator i = range.begin();
-    while (i != range.end())
+    const uint1024_t parsed_sample_size(args.sample_size);
+    lazycp::RandomIterator iter(parsed_sample_size, max_size - 1);
+    while (iter.has_next())
     {
-        vector<string> result = lazy_cartesian_product::boost_entry_at(args.pc.combinations, (*i).convert_to<string>());
+        vector<string> result = lazy_cartesian_product::boost_entry_at(args.pc.combinations, iter.next().convert_to<string>());
         output_result(result, args, true);
-        if (args.display_json && i != range.end())
+        if (args.display_json && iter.has_next())
         {
             cout << ",";
         }
-        ++i;
     }
     if (args.display_json)
     {
diff --git a/src/combigen.cpp b/src/combigen.cpp
@@ -84,8 +84,7 @@ const void parse_args(const generation_args &args)
             }
             else
             {
-                set<unsigned long long> range = lazy_cartesian_product::generate_random_indices(n, max_size);
-                generate_random_samples(range, args);
+                generate_random_samples(max_size, args);
             }
             exit(0);
         }
@@ -127,7 +126,7 @@ const void generate_all(const unsigned long long &max_size, const generation_arg
     }
 }
 
-const void generate_random_samples(const set<unsigned long long> &range, const generation_args &args)
+const void generate_random_samples(const unsigned long long &max_size, const generation_args &args)
 {
     if (!args.display_json)
     {
@@ -140,16 +139,16 @@ const void generate_random_samples(const set<unsigned long long> &range, const g
     {
         cout << "[\n";
     }
-    set<unsigned long long>::const_iterator i = range.begin();
-    while (i != range.end())
+    unsigned long long parsed_sample_size = stoull(args.sample_size);
+    lazycp::RandomIterator iter(parsed_sample_size, max_size - 1);
+    while (iter.has_next())
     {
-        vector<string> result = lazy_cartesian_product::entry_at(args.pc.combinations, *i);
+        vector<string> result = lazy_cartesian_product::entry_at(args.pc.combinations, iter.next());
         output_result(result, args, true);
-        if (args.display_json && i != range.end())
+        if (args.display_json && iter.has_next())
         {
             cout << ",";
         }
-        ++i;
     }
     if (args.display_json)
     {
diff --git a/src/combigen.h b/src/combigen.h
@@ -68,10 +68,10 @@ struct generation_args
 
 #ifdef USE_BOOST
 const void                   generate_all(const uint1024_t &max_size, const generation_args &args);
-const void                   generate_random_samples(const set<uint1024_t> &range, const generation_args &args);
+const void                   generate_random_samples(const uint1024_t &max_size, const generation_args &args);
 #else
 const void                   generate_all(const unsigned long long &max_size, const generation_args &args);
-const void                   generate_random_samples(const set<unsigned long long> &range, const generation_args &args);
+const void                   generate_random_samples(const unsigned long long &max_size, const generation_args &args);
 #endif
 const void                   generate_random_samples_performance_mode(const generation_args &args);
 const void                   generate_random_samples_memory_mode(const generation_args &args);
diff --git a/src/lib/iamtheburd/lazy-cartesian-product b/src/lib/iamtheburd/lazy-cartesian-product
@@ -1 +1 @@
-Subproject commit aabb7b1a88e8279211e511d1a53324fc5cb925f9
+Subproject commit 3fa7a56069c9dcdb072d908ce05e03113caac406
diff --git a/src/main.cpp b/src/main.cpp
@@ -20,8 +20,8 @@
 #define MAIN
 
 #define COMBIGEN_MAJOR_VERSION 1
-#define COMBIGEN_MINOR_VERSION 3
-#define COMBIGEN_REVISION_VERSION 2
+#define COMBIGEN_MINOR_VERSION 4
+#define COMBIGEN_REVISION_VERSION 0
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
 #include "lib/win-getopt/getopt.h"
@@ -101,12 +101,14 @@ int main(int argc, char* argv[])
                 break;
             case 'k':
                 args_provided = true;
+                args.display_keys = true;
                 break;
             case 'v':
                 cout << "combigen - v" << COMBIGEN_MAJOR_VERSION << '.' << COMBIGEN_MINOR_VERSION << '.' << COMBIGEN_REVISION_VERSION << '\n';
                 exit(0);
             case 'p':
                 args.perf_mode = true;
+                args_provided = true;
                 break;
             default: 
                 display_help();

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ const void parse_args(const generation_args &args)`
`86`	`86`	`}`
`87`	`87`	`else`
`88`	`88`	`{`
`89`		`- set<uint1024_t> range = lazy_cartesian_product::boost_generate_random_indices(args.sample_size, max_size);`
`90`		`- generate_random_samples(range, args);`
	`89`	`+ generate_random_samples(max_size, args);`
`91`	`90`	`}`
`92`	`91`	`exit(0);`
`93`	`92`	`}`
`@@ -99,7 +98,7 @@ const void parse_args(const generation_args &args)`
`99`	`98`	`}`
`100`	`99`	`}`
`101`	`100`
`102`		`-const void generate_random_samples(const set<uint1024_t> &range, const generation_args &args)`
	`101`	`+const void generate_random_samples(const uint1024_t &max_size, const generation_args &args)`
`103`	`102`	`{`
`104`	`103`	`if (!args.display_json)`
`105`	`104`	`{`
`@@ -112,16 +111,16 @@ const void generate_random_samples(const set<uint1024_t> &range, const generatio`
`112`	`111`	`{`
`113`	`112`	`cout << "[\n";`
`114`	`113`	`}`
`115`		`- set<uint1024_t>::const_iterator i = range.begin();`
`116`		`- while (i != range.end())`
	`114`	`+ const uint1024_t parsed_sample_size(args.sample_size);`
	`115`	`+ lazycp::RandomIterator iter(parsed_sample_size, max_size - 1);`
	`116`	`+ while (iter.has_next())`
`117`	`117`	`{`
`118`		`- vector<string> result = lazy_cartesian_product::boost_entry_at(args.pc.combinations, (*i).convert_to<string>());`
	`118`	`+ vector<string> result = lazy_cartesian_product::boost_entry_at(args.pc.combinations, iter.next().convert_to<string>());`
`119`	`119`	`output_result(result, args, true);`
`120`		`- if (args.display_json && i != range.end())`
	`120`	`+ if (args.display_json && iter.has_next())`
`121`	`121`	`{`
`122`	`122`	`cout << ",";`
`123`	`123`	`}`
`124`		`- ++i;`
`125`	`124`	`}`
`126`	`125`	`if (args.display_json)`
`127`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ const void parse_args(const generation_args &args)`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`		`- set<unsigned long long> range = lazy_cartesian_product::generate_random_indices(n, max_size);`
`88`		`- generate_random_samples(range, args);`
	`87`	`+ generate_random_samples(max_size, args);`
`89`	`88`	`}`
`90`	`89`	`exit(0);`
`91`	`90`	`}`
`@@ -127,7 +126,7 @@ const void generate_all(const unsigned long long &max_size, const generation_arg`
`127`	`126`	`}`
`128`	`127`	`}`
`129`	`128`
`130`		`-const void generate_random_samples(const set<unsigned long long> &range, const generation_args &args)`
	`129`	`+const void generate_random_samples(const unsigned long long &max_size, const generation_args &args)`
`131`	`130`	`{`
`132`	`131`	`if (!args.display_json)`
`133`	`132`	`{`
`@@ -140,16 +139,16 @@ const void generate_random_samples(const set<unsigned long long> &range, const g`
`140`	`139`	`{`
`141`	`140`	`cout << "[\n";`
`142`	`141`	`}`
`143`		`- set<unsigned long long>::const_iterator i = range.begin();`
`144`		`- while (i != range.end())`
	`142`	`+ unsigned long long parsed_sample_size = stoull(args.sample_size);`
	`143`	`+ lazycp::RandomIterator iter(parsed_sample_size, max_size - 1);`
	`144`	`+ while (iter.has_next())`
`145`	`145`	`{`
`146`		`- vector<string> result = lazy_cartesian_product::entry_at(args.pc.combinations, *i);`
	`146`	`+ vector<string> result = lazy_cartesian_product::entry_at(args.pc.combinations, iter.next());`
`147`	`147`	`output_result(result, args, true);`
`148`		`- if (args.display_json && i != range.end())`
	`148`	`+ if (args.display_json && iter.has_next())`
`149`	`149`	`{`
`150`	`150`	`cout << ",";`
`151`	`151`	`}`
`152`		`- ++i;`
`153`	`152`	`}`
`154`	`153`	`if (args.display_json)`
`155`	`154`	`{`