Merge pull request #13 from NoUITeam/test

For web. **.txt only.

Author: Jianxff

Decode.cpp

@@ -4,19 +4,18 @@
 bool Document::Decode() {
     long long data = 0;
     int flag = TOP_NUM;
-    int buffer = 0;
+    unsigned char buffer[9]="00000000";
     while (!feof(reader)) {
-        if (fread( & buffer, 1, 1, reader) <= 0 && !feof(reader)) //如果读取失败，则返回错误
+        if (fread( & buffer, 8, 1, reader) <= 0 && !feof(reader)) //如果读取失败，则返回错误
             return false;
         if(feof(reader)){
             cout << "Finish. Check '" << FILEname << "'." << endl;
             return true;
         }
-        char bits[9] = "00000000";
-        toBinary(bits, buffer);
+        fseek(reader,1,SEEK_CUR);
         ///8bit合并输出
         for (int i = 0; i < 8; i++) {
-            flag = HuffmanTree[flag][bits[i] == '0' ? _left : _right]; //按bit读取到0，向左子树找；否则向右子树找
+            flag = HuffmanTree[flag][buffer[i] == '0' ? _left : _right]; //按bit读取到0，向左子树找；否则向右子树找
             if (HuffmanTree[flag][_left] == -1 && HuffmanTree[flag][_right] == -1) {   //判断是否是叶子节点，若是则写入叶子节点编号
                 if (fwrite( & flag, 1, 1, writer) <= 0)
                     return false;
@@ -32,3 +31,4 @@ bool Document::Decode() {
     return false;
 }
 
+

Document.cpp

@@ -6,12 +6,12 @@ Document::Document(string filePath, string fileName) {
     FILEpath = filePath.c_str();
     FILEname = fileName.c_str();
     reader = writer = NULL;
-    reader = fopen(FILEpath, "rb");
+    reader = fopen(FILEpath, "r");
     writer = fopen(FILEname, "wb");
     //
     top = TOP_NUM;
     FILEsize = buff_t = bitSeq_p = 0;
-    buff_p=7;
+    buff_p =7;
     memset(buff, 0, sizeof(buff));
     memset(bitSeq, 0, sizeof(bitSeq));
     //
@@ -97,13 +97,14 @@ bool Document::HTreeCreate() {
         HuffmanTree[node1][_parent] = HuffmanTree[node2][_parent] = flag;
         HuffmanTree[flag][_left] = node1;
         HuffmanTree[flag][_right] = node2;
-        if (!Nodes.empty()) 
-            Nodes.push(Node(flag, new_weight, 256)); //新节点入堆
+        if (!Nodes.empty())
+            Nodes.push(Node(flag, new_weight, 256));    //新节点入堆
         top = flag;
         flag++;
     }
-    //记录文件大小（/字节）
     FILEsize = HuffmanTree[top][_weigth];
+    //记录文件大小（/字节）
+    
     return true;
 }
 

Encode.cpp

@@ -6,7 +6,18 @@ bool Document::Encode() {
     fseek(writer, 0, 0);
     if (!reader || !writer)
         return false;
-    fwrite( & FILEsize, 8, 1, writer);
+    char FileSizeBit[65];
+    memset(FileSizeBit,'0',sizeof(FileSizeBit));
+    FileSizeBit[64]='\0';
+    toBinary(FileSizeBit,FILEsize);
+    for(int j=56;j>=0;j-=8){
+        for(int i=0;i<8;i++){
+            fprintf(writer,"%c",FileSizeBit[i+j]);
+        }
+        fprintf(writer," ");
+    }
+    //fprintf(writer,"%s ",FileSizeBit);
+    //fwrite( & FILEsize, 8, 1, writer);
     enCodingTree(top);  //写入树结构编码
     ///
     int buffer = 0;
@@ -18,36 +29,54 @@ bool Document::Encode() {
             for (int i = 0; i < strlen(str); i++) {
                 bitStr[indic++] = str[i];
                 if (indic == 8) { //按8bit为一单位输出
-                    int byte = toInt(bitStr);
-                    fwrite( & byte, 1, 1, writer);
+                    //int byte = toInt(bitStr);
+                    fwrite( & bitStr, 8, 1, writer);
                     strcpy(bitStr, "00000000");
                     indic = 0;
+                    fprintf(writer," ");
                 }
             }
         }
     }
     if (indic != 0) {  //最后一个字节不满8位则以0补足
-        int byte = toInt(bitStr);
-        if (fwrite( & byte, 1, 1, writer) <= 0) return false;
+        //int byte = toInt(bitStr);
+        if (fwrite( & bitStr, 8, 1, writer) <= 0) return false;
     }
     cout << "Finish. Check '" << FILEname << "'." << endl;
+    cout<<FILEsize<<endl;
     return true;
 }
 
 //对哈夫曼树进行编码
 bool Document::enCodingTree(int top) {
     searchTree(top);
     //
-    fwrite( & (++buff_t), 1, 1, writer); //写入首字节:树结构数组的大小
-    fwrite(buff, buff_t, 1, writer); //写入buff数组:存储树结构的
-    fwrite(bitSeq, bitSeq_p, 1, writer); //写入bitseq数组:按照DFS序,依次存储权值从大到小的字节叶子
+    char _buff_t[9]="00000000";
+    toBinary(_buff_t,(++buff_t));
+    fprintf(writer,"%s ",_buff_t);
+    //fwrite( & (++buff_t), 1, 1, writer); //写入首字节:树结构数组的大小
+    //fprintf(writer,"%s",buff);
+    for(int i=0;i<buff_t;i++){
+        char s[9]="00000000";
+        toBinary(s,(int)buff[i]);
+        fprintf(writer,"%s ",s);
+    }
+    //fwrite(buff, buff_t, 1, writer); //写入buff数组:存储树结构的
+    for(int i=0;i<bitSeq_p;i++){
+        char numBit[9]="00000000";
+        toBinary(numBit,(int)bitSeq[i]);
+        fwrite( & numBit, 8, 1, writer);
+        fprintf(writer," ");
+    }
+    //fwrite(bitSeq, bitSeq_p, 1, writer); //写入bitseq数组:按照DFS序,依次存储权值从大到小的字节叶子
     return true;
 };
 
 //递归的DFS哈夫曼树,进行编码
 void Document::searchTree(int now) {
     bool Cflag = (HuffmanTree[now][_left] == -1); //判断是否有孩子
     buff[buff_t] |= ((!Cflag) << buff_p--);
+    //buff[buff_t]+='0';
     /*
         1.大端法，从左向右依次记录
         2.如果当前节点now有孩子，则Cflag为0 取反后将当前位置位1
@@ -64,4 +93,5 @@ void Document::searchTree(int now) {
 
     searchTree(HuffmanTree[now][_left]);
     searchTree(HuffmanTree[now][_right]);
-}
+}
+

HuffmanCoding.h

@@ -65,4 +65,4 @@ class Document{
     int toInt(char* bit);
     void toBinary(char* binary,int num);
 };
-#endif
+#endif

Main.cpp

@@ -1,20 +1,9 @@
 #include "HuffmanCoding.h"
 
-int main(){
+int main(int argc,char* argv[]){
     int mode = 0 ,  mode_2 = 0; 
-    cout<<"Enter 0 to encode,1 to decode and -1 to exit.\nMode:";
-    scanf("%d",&mode);
-    while(mode!=-1){
-        // Readin process.
-        string filePath,fileName;
-        cout<<"Enter name or path of source file: ";
-        cin>>filePath;    
-        if(mode!=2){
-            cout<<"Enter export file name: ";
-            cin>>fileName;
-        }else{
-            fileName="__out";
-        }
+    mode=(argv[1][0]-'0');
+        string filePath="in.txt",fileName="out.txt";
         /////////////////////////////////////////////////////////////////  
         Document File(filePath,fileName);      //Construct FILE.
         switch(mode){
@@ -28,22 +17,6 @@ int main(){
                     if(!File.Decode())
                         cout<<"Invalid CodeTree. Check your file."<<endl;
                 }break;
-            case 2:
-                cout<<"Enter check_Mode:";
-                cin>>mode_2;
-                if(File.Init(mode_2)){
-                    cout<<"HuffmanTree check for mode:"<<mode_2<<endl;
-                    File.checkTree();
-                }break;
-            default:
-                cout<<"Invalid mode number. Check your input."<<endl;
         }
-        Sleep(300);
-        cout<<"Enter 0 to encode,1 to decode and -1 to exit.\nMode:";
-        scanf("%d",&mode);
-    }
-    cout<<"\nSee you next time."<<endl;
-    cout<<"\n--Made by @NoUITeam.\n--Website: https://github.com/NoUITeam"<<endl;
-    Sleep(2000);
     return 0;
 }

README.md

@@ -17,3 +17,4 @@
 **[info]** 2021-12-02 Program for web. **.txt files only.
 
 **[info]** 2021-12-02 Fix some bugs.
+

Readin.cpp

@@ -11,25 +11,37 @@ bool Document::ReadinSource() {
         if(feof(reader)) return true;
         BytecodeArray[buffer]++;
     }
+
     return true;
 }
 
 //读取已解码文件
 //从文件中读入头部分,进行解码并还原树
 bool Document::ReadinCode() {
-    int head_t = 0;
     int _top = TOP_NUM;
     memset(buff, 0, sizeof(buff));
-    if (fread( & FILEsize, 8, 1, reader) <= 0) return false; //读取文件大小（字节数）
-    if (fread( & head_t, 1, 1, reader) <= 0) return false; //读入首字节:树结构数组的大小
-    if (fread( & buff, 1, head_t, reader) <= 0) return false; //读入树结构数组.此后fp位于首个字节叶子
+    char reading[9]="00000000";
+    for(int i=0;i<8;i++){
+        if(fread(&reading,8,1,reader) <= 0) return false;
+        FILEsize+=toInt(reading)*pow(2,8*i);
+        fseek(reader,1,SEEK_CUR);
+    }
+    if (fread( & reading, 8, 1, reader) <= 0) return false; //读入首字节:树结构数组的大小
+    int head_t=toInt(reading);
+    fseek(reader,1,SEEK_CUR);
+    for(int i=0;i<head_t;i++){
+        if(fread(&reading,8,1,reader) <= 0) return false;
+        fseek(reader,1,SEEK_CUR);
+        buff[i]=toInt(reading);
+    }
+    //读入树结构数组.此后fp位于首个字节叶子
     RebuildTree(_top); //构建树
     return true;
 }
 
 //DFS遍历,建立哈夫曼树.返回当前节点是否为字节叶子
 bool Document::RebuildTree(int & now) {
-    unsigned char t = 0;
+    //int t = 0;
     int _now = now;
     bool Cflag = (buff[buff_t] & (1 << buff_p--)); //判断是否有孩子
     if (buff_p == -1)
@@ -39,14 +51,19 @@ bool Document::RebuildTree(int & now) {
         return true;
     } //当前是字节叶子节点.
     HuffmanTree[_now][_left] = ++now;
+    
     if (RebuildTree(now)) { //如果是字节叶子节点,则顺序读入一个字节叶子数据
-        if (fread( & t, 1, 1, reader) <= 0) return false;
-        HuffmanTree[_now][_left] = t;
+        char node[9]="00000000";
+        if (fread( & node, 8, 1, reader) <= 0) return false;
+        fseek(reader,1,SEEK_CUR);
+        HuffmanTree[_now][_left] = toInt(node);
     }
     HuffmanTree[_now][_right] = ++now;
     if (RebuildTree(now)) {
-        if (fread( & t, 1, 1, reader) <= 0) return false;
-        HuffmanTree[_now][_right] = t;
+        char node[9]="00000000";
+        if (fread( & node, 8, 1, reader) <= 0) return false;
+        fseek(reader,1,SEEK_CUR);
+        HuffmanTree[_now][_right] = toInt(node);
     }
     return false;
 }