Fixed generator

Author: EduMenges

.idea/advanced_algorithms.iml

@@ -1,2 +1,2 @@
-add_executable(he_xu he_xu.cpp)
-add_executable(knapsack_generator generator.cpp)
+add_executable(knapsack hexu_and_dp.cpp)
+add_executable(knapsack_generator generator.cpp)

5/CMakeLists.txt

@@ -1,6 +1,7 @@
-#include <random>
+#include <string>
 #include <iosfwd>
 #include <iostream>
+#include <random>
 
 using namespace std;
 
@@ -9,34 +10,43 @@ int main(int argc, char** argv) {
     cin.tie(nullptr);
 
     if (argc < 2) {
-        cerr << "Usage: generator n\n";
+        cerr << "Usage: generator n <capacity> <w_max>\n";
+        return EXIT_FAILURE;
     }
 
     auto n = stoull(argv[1]);
 
+    uint64_t capacity = n * numeric_limits<uint8_t>::max() / 4;
+    if (argc >= 3) {
+        capacity = stoull(argv[2]);
+    }
+
+    uint16_t max_weight = numeric_limits<uint8_t>::max();
+    if (argc >= 4) {
+        max_weight = stoul(argv[3]);
+    }
+
     random_device rd;
     mt19937_64 g(rd());
 
     constexpr uint8_t MAX_VALUE = numeric_limits<uint8_t>::max();
-    constexpr uint8_t MAX_WEIGHT = numeric_limits<uint8_t>::max();
 
-    uniform_int_distribution<uint8_t> value_dist(1, MAX_VALUE);
-    uniform_int_distribution<uint8_t> weight_dist(1, MAX_WEIGHT);
-
-    // Capacity is a forth of the maximum weight
-    uint64_t capacity = n * MAX_WEIGHT / 4;
+    uniform_int_distribution<uint16_t> value_dist(1, MAX_VALUE);
+    uniform_int_distribution<uint16_t> weight_dist(1, max_weight);
 
     cout << n << ' ' << capacity << '\n';
 
     // Values
     for (uint64_t i = 0; i < n; ++i) {
-        cout << static_cast<uint32_t>(value_dist(g)) << ' ';
+        cout << value_dist(g) << ' ';
     }
     cout << '\n';
 
     // Weight
     for (uint64_t i = 0; i < n; ++i) {
-        cout << static_cast<uint32_t>(weight_dist(g)) << ' ';
+        cout << weight_dist(g) << ' ';
     }
     cout << '\n';
-}
+
+    return EXIT_SUCCESS;
+}

5/generator.cpp

@@ -6,7 +6,6 @@
 #include <random>
 #include <ranges>
 #include <span>
-#include <unordered_map>
 #include <vector>
 
 using namespace std;
@@ -116,6 +115,6 @@ int main() {
     auto time_hexu =
         chrono::duration_cast<chrono::milliseconds>(chrono::duration(now - start)).count();
 
-    cout << result_dp << ',' << time_dp << ',' << updates_dp << ',' << result_dp << ',' << time_hexu
+    cout << result_dp << ',' << time_dp << ',' << updates_dp << ',' << result_hexu << ',' << time_hexu
          << ',' << updates_hexu << '\n';
 }