oreodave/cw_tree
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed from int64_t to optional<word_t> for pointers in Node

Browse Source
This commit is contained in:
Aryadev Chavali
2024-07-26 17:00:59 +01:00
parent c96c4630d5
commit 8cbc602799
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/numerics.cpp
View File

@@ -43,7 +43,7 @@ bool Fraction::operator==(const Fraction &other)
return numerator == other.numerator && denominator == other.denominator; return numerator == other.numerator && denominator == other.denominator;
} }
Node::Node(Fraction val, int64_t left, int64_t right) Node::Node(Fraction val, index_t left, index_t right)
: value{val}, left{left}, right{right} : value{val}, left{left}, right{right}
{ {
} }
@@ -107,10 +107,13 @@ void indent_depth(int depth, std::stringstream &ss)
ss << " "; ss << " ";
} }
std::string to_string(const NodeAllocator &allocator, const word_t n, int depth) std::string to_string(const NodeAllocator &allocator, const index_t n,
int depth)
{ {
if (!n.has_value())
return "NIL";
std::stringstream ss; std::stringstream ss;
Node x = allocator.vec[n]; Node x = allocator.getVal(n.value());
ss << "(" << to_string(x.value) << "\n"; ss << "(" << to_string(x.value) << "\n";
indent_depth(depth, ss); indent_depth(depth, ss);
if (x.left == -1) if (x.left == -1)

9
src/numerics.hpp
View File

@@ -19,6 +19,7 @@
#include <cstdint> #include <cstdint>
#include <optional>
#include <queue> #include <queue>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -26,6 +27,7 @@
#define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B))
#define MAX(A, B) ((B) < (A) ? (A) : (B)) #define MAX(A, B) ((B) < (A) ? (A) : (B))
typedef uint64_t word_t; typedef uint64_t word_t;
typedef std::optional<word_t> index_t;
struct Fraction struct Fraction
{ {
@@ -40,9 +42,10 @@ struct Fraction
struct Node struct Node
{ {
Fraction value; Fraction value;
int64_t left, right; index_t left, right;
Node(Fraction val = {}, int64_t left = -1, int64_t right = -1); Node(Fraction val = {}, index_t left = std::nullopt,
index_t right = std::nullopt);
}; };
struct NodeAllocator struct NodeAllocator
@@ -57,6 +60,6 @@ word_t gcd(word_t a, word_t b);
Fraction iterate(std::queue<word_t> &queue, NodeAllocator &allocator); Fraction iterate(std::queue<word_t> &queue, NodeAllocator &allocator);
std::string to_string(const Fraction &); std::string to_string(const Fraction &);
std::string to_string(const NodeAllocator &, const word_t, int depth = 1); std::string to_string(const NodeAllocator &, const index_t, int depth = 1);
#endif #endif