a/Compression-Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update main.cpp

Browse source
This commit is contained in:
Anthony Wang 2020-05-30 00:58:23 +00:00 committed by repl.it user
parent 49064a178b
commit 98541727b8
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/huffman.cpp
View file

@ -22,10 +22,8 @@ namespace huffman {
}
else {
v.push_back(0);
if (n->l) v.push_back(1), encode_tree(n->l, v);
else v.push_back(0);
if (n->r) v.push_back(1), encode_tree(n->r, v);
else v.push_back(0);
n->l ? v.push_back(1), encode_tree(n->l, v) : v.push_back(0);
n->r ? v.push_back(1), encode_tree(n->r, v) : v.push_back(0);
}
}
@ -43,13 +41,11 @@ namespace huffman {
void generate(vector<int> f) {
priority_queue<node *, vector<node *>, comp> pq;
for (int c = 1; c < 128; ++c) if (f[c]) {
node * n = new node(c, f[c]);
pq.push(n);
node * n = new node(c, f[c]); pq.push(n);
}
while (pq.size() > 1) {
node * l = pq.top(); pq.pop(); node * r = pq.top(); pq.pop();
node * n = new node(0, l->f + r->f);
n->l = l, n->r = r;
node * n = new node(0, l->f + r->f); n->l = l, n->r = r;
pq.push(n);
}
root = pq.top();
@ -68,9 +64,7 @@ namespace huffman {
traverse(root);
vector<bool> ret;
encode_tree(root, ret);
for (auto& c : s) {
for (auto b : code[c]) ret.push_back(b);
}
for (auto& c : s) for (auto b : code[c]) ret.push_back(b);
return ret;
}

6
src/main.cpp
View file

@ -3,7 +3,6 @@
#define pb push_back
struct weightstruct
{
int word;
@ -363,12 +362,12 @@ int main() {
*/
// WARNING: Huffman will CRASH if you pass a string with only one unique /*aracter
// WARNING: Huffman will CRASH if you pass a string with only one unique character
/*string orig = "test1234";
vector<bool> enc = huffman::encode(orig);
string dec = huffman::decode(enc);
if (orig != dec) {
cout << "Not a match!\n";
cout << "Not a match!\n";
}
else {
cout << dec << '\n';
@ -379,4 +378,3 @@ int main() {
cout << "Percent compression: " << 100.0 - (double)100.0 * (enc.size() + 7) / 8 / orig.size() << "%\n";
}*/
}