Browse Source

changed compression calculations to subtract constant size of root nodes

tarfeef101 7 years ago
parent
commit
8fa43f72d6
4 changed files with 4 additions and 4 deletions
  1. 2 2
      source1.h
  2. 2 2
      source3.h
  3. BIN
      testfile
  4. BIN
      testfile3

+ 2 - 2
source1.h

@@ -744,13 +744,13 @@ class Triehard // compressed binary trie
     float compressionovertrie() // returns nodes / nodes in a normal trie
 	{
 		float total = left->sumMag() + right->sumMag();
-		float compressed = left->sumCount() + right->sumCount();
+		float compressed = left->sumCount() + right->sumCount() - 2;
 		return roundf(compressed/total * 100) / 100;
 	}
     
     float compressionoverdict() // returns nodes / sum of all word length
     {
-    	float compressed = left->sumCount() + right->sumCount();
+    	float compressed = left->sumCount() + right->sumCount() - 2;
     	float total = countChars();
     	return roundf(compressed/total * 100) / 100;
     }

+ 2 - 2
source3.h

@@ -506,7 +506,7 @@ class Triehard // compressed decimal trie
     float compressionovertrie() // returns nodes / nodes in a normal trie
 	{
 		float total = 0;
-		float compressed = 0;
+		float compressed = -10;
     	for (int i = 0; i < 10; ++i)
     	{
     		compressed += nodes[i]->sumCount();
@@ -517,7 +517,7 @@ class Triehard // compressed decimal trie
     
     float compressionoverdict() // returns nodes / sum of all word length
     {
-    	float compressed = 0;
+    	float compressed = -10;
     	for (int i = 0; i < 10; ++i)
     	{
     		compressed += nodes[i]->sumCount();

BIN
testfile


BIN
testfile3