Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
@philiprbrenan
philiprbrenan committed Nov 10, 2024
1 parent 76e6fcf commit 9855b84
Showing 1 changed file with 24 additions and 18 deletions.
42 changes: 24 additions & 18 deletions Btree.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,17 @@ void free(int index) //
freeList.push(index);
}

void printLeafData() // Check that keyData and KeyNext allocation addresses have not been relocated
{for (int i = 0; i < treeSize; i++) // Make sure that all allocated branches and leaves that are accessible from the root of the tree
{BranchOrLeaf n = nodes[i];
if (isLeaf(i))
{final Leaf l = new Leaf(i);
final int N = l.leafSize().asInt();
say(l);
}
}
}

//D1 Components // A branch or leaf in the tree

class BranchOrLeaf // A branch or leaf in a btree
Expand Down Expand Up @@ -563,7 +574,6 @@ class UnpackLeaves // U
void repackLeaves(Stack<KeyData>up, KeyNext[]kn) // Repack the key, data pairs into leaves under the current branch
{final int N = up.size(); // Recreate the leaves with the key, data pairs packed in
Leaf leaf = pushNewLeaf(); // First new leaf into branch
if (debug) say("DDDD111", Branch.this, up);
for (int k = 0; k < N; k++) // Repack the leaves
{z();
final KeyData source = up.elementAt(k); // Source of repack
Expand All @@ -573,9 +583,7 @@ void repackLeaves(Stack<KeyData>up, KeyNext[]kn) // R
}
leaf.keyData()[leaf.leafSize().asInt()].set(source); // Push current key, data pair into the current leaf
leaf.incLeafSize(); // Move up in leaf
if (debug) say("DDDD 222", leaf, this);
}
if (debug) say(Btree.this.print());

final Leaf t = new Leaf(top()); // The top leaf is empty so we replace it with the next top leaf
if (new Leaf(top()).leafSize().asInt() == 0) // The top leaf is empty so we replace it with the next top leaf
Expand Down Expand Up @@ -854,6 +862,7 @@ class Data extends Fixed //
{final boolean[] data = new boolean[bitsPerData]; // Data is composed of bits
Data() {z();}
Data(int n) {z(); intToBits(n, data);}
Data(Data Data) {z(); set(Data);}
int asInt() {return bitsToInt(data);}
public String toString() {z(); return ""+bitsToInt(data);}
void set(Data Data) // Copy the specified datum into the current datum
Expand Down Expand Up @@ -1108,14 +1117,13 @@ void put(int Key) //

Data delete(Key Key) // Delete a key from the tree and returnsd is data if present
{z();
if (debug) say("AAAA111", print());
final Find f = new Find(Key); // Try direct insertion with no modifications to the shape of the tree
if (!f.found()) return null; // Inserted or updated successfully
z();
final Leaf l = f.leaf(); // The leaf that contains the key
final int N = l.leafSize().asInt(), p = f.index().asInt(); // Size of leaf, position in the leaf of the key
final KeyData[]kd = l.keyData(); // Key, data pairs in the leaf
final Data data = kd[p].data; // Data associated with the leaf
final Data data = new Data(kd[p].data); // Data associated with the leaf
for (int i = p; i < N-1; ++i) // Remove the key, data pair from the leaf
{z();
kd[i] = new KeyData(kd[i+1]);
Expand Down Expand Up @@ -1710,22 +1718,20 @@ static void test_delete2()
ok(t.delete(t.new Key(29)), 29);
ok(t.delete(t.new Key(30)), 30);
ok(t.delete(t.new Key(31)), 31);
stop(t);
debug = true;
ok(t.delete(t.new Key(32)), 32);
t.checkFreeList();

stop(t);
//stop(t);
t.ok("""
16 32 48 |
0 0.1 0.2 |
9 14 21 |
6 |
4 8 12 31 36 40 44 52 56 60 |
9 9.1 9.2 14 21 21.1 21.2 6 6.1 6.2 |
3 1 4 8 13 15 11 18 22 16 |
7 12 17 2 |
1,2,3,4=3 5,6,7,8=1 9,10,11,12=4 13,14,15,16=7 25,26,27,28=8 32=12 33,34,35,36=13 37,38,39,40=15 41,42,43,44=11 45,46,47,48=17 49,50,51,52=18 53,54,55,56=22 57,58,59,60=16 61,62,63,64=2 |
16 32 48 |
0 0.1 0.2 |
9 14 21 |
6 |
4 8 12 14Empty 36 40 44 52 56 60 |
9 9.1 9.2 21 21.1 21.2 6 6.1 6.2 |
3 1 4 13 15 11 18 22 16 |
7 12 17 2 |
1,2,3,4=3 5,6,7,8=1 9,10,11,12=4 13,14,15,16=7 25,26,27,28=12 33,34,35,36=13 37,38,39,40=15 41,42,43,44=11 45,46,47,48=17 49,50,51,52=18 53,54,55,56=22 57,58,59,60=16 61,62,63,64=2 |
""");
}

Expand All @@ -1743,7 +1749,7 @@ static void oldTests() //
}

static void newTests() // Tests being worked on
{//oldTests();
{oldTests();
test_delete2();
}

Expand Down

0 comments on commit 9855b84

Please sign in to comment.