Fixed braced-initializer cursor initialization

include/flux/adaptor/permutations.hpp

@@ -113,7 +113,7 @@
             std::iota(indices.begin(), indices.end(), 0);
 
             // return the cursor
-            return {.indices_ = indices, .index_ = 0};
+            return {.indices_ = indices, .permutation_index_ = 0};
         }
 
         static constexpr auto last(self_t& self) -> cursor_type
@@ -130,7 +130,7 @@
             std::iota(indices.rbegin(), indices.rend(), 0);
 
             // return the cursor
-            return {.indices_ = indices, .index_ = self.count_permutations()};
+            return {.indices_ = indices, .permutation_index_ = self.count_permutations()};
         }
 
         static constexpr auto is_last([[maybe_unused]] self_t& self, const cursor_type& cursor)
@@ -154,7 +154,7 @@
         static constexpr auto read_at(self_t& self, const cursor_type& cursor) -> value_type
         {
             if (not self.is_cached()) {
                 self.cache_base();
             }
             return reindex_vec<inner_value_t>(self.cache_, cursor.indices_);
         }

include/flux/adaptor/permutations_sized.hpp

@@ -67,7 +67,7 @@
         if (SubsequenceSize <= size) {
             size_ = factorial(cache_.size()) / factorial(cache_.size() - SubsequenceSize);
         } else {
             size_ = 0;
         }
 
         state_ = state_t::Cached;
@@ -83,15 +83,15 @@
         struct cursor_type {
             std::vector<std::size_t> indices_;
             std::vector<std::size_t> cycles_;
-            std::size_t index_;
+            std::size_t permutation_index_;
 
             [[nodiscard]] constexpr auto operator<=>(const cursor_type& other) const
             {
-                return index_ <=> other.index_;
+                return permutation_index_ <=> other.permutation_index_;
             }
             [[nodiscard]] constexpr bool operator==(const cursor_type& other) const
             {
-                return index_ == other.index_;
+                return permutation_index_ == other.permutation_index_;
             }
         };
 
@@ -118,7 +118,7 @@
             std::iota(cycles.rbegin(), cycles.rend(), base_length - SubsequenceSize);
 
             // return the cursor
-            return {.indices_ = indices, .cycles_ = cycles, .index_ = 0};
+            return {.indices_ = indices, .cycles_ = cycles, .permutation_index_ = 0};
         }
 
         static constexpr auto last(self_t& self) -> cursor_type
@@ -138,20 +138,20 @@
             std::vector<std::size_t> cycles(SubsequenceSize, 0);
 
             // return the cursor
-            return {.indices_ = indices, .cycles_ = cycles, .index_ = self.count_permutations()};
+            return {.indices_ = indices, .cycles_ = cycles, .permutation_index_ = self.count_permutations()};
         }
 
         static constexpr auto is_last(self_t& self, const cursor_type& cursor) -> bool
         {
-            return cursor.index_ >= self.count_permutations();
+            return cursor.permutation_index_ >= self.count_permutations();
         }
 
         static constexpr auto inc(self_t& self, cursor_type& cursor) -> void
         {
             const auto k = SubsequenceSize;
             const auto n = self.cache_.size();
 
-            cursor.index_ += 1;
+            cursor.permutation_index_ += 1;
 
             for (const auto i : flux::iota(std::size_t {0}, std::size_t {k}).reverse()) {
                 if (cursor.cycles_[i] == 0) {
@@ -170,7 +170,7 @@
         static constexpr auto read_at(self_t& self, const cursor_type& cursor) -> value_type
         {
             if (not self.is_cached()) {
                 self.cache_base();
             }
             return reindex_vec<inner_value_t>(self.cache_, cursor.indices_, SubsequenceSize);
         }