Agrego opción para incluir ZG en jacu (sólo en la compresión, por ahora).

diff --git a/src/Makefile b/src/Makefile
index a046cdeeb42e2c53a90d35d3558f4a8df1f2c0ce..87d5c6654a3d3215982132edd20e8f8a9fc8dd7d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,7 +25,8 @@
 #
 
 TARGETS=jacu
 #
 
 TARGETS=jacu

-COMMON=mtf/mtf.o blocksorting/bs.o statichuff/statichuff.o vfile/vfile.o vfile/common.o
+COMMON=zerogrouping/zerogrouping.o mtf/mtf.o blocksorting/bs.o \
+       statichuff/statichuff.o vfile/vfile.o vfile/common.o

 SRCS=jacu.c
 
 #CFLAGS=-O3 -Wall -DNDEBUG
 SRCS=jacu.c
 
 #CFLAGS=-O3 -Wall -DNDEBUG

diff --git a/src/jacu.c b/src/jacu.c
index 3d18ed3be44af85c1c97ae75db13ec99fe6283ff..fc4188f0f0b2916c7ab52734c0a35bc7bd4709cf 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -1,7 +1,8 @@
 
 

-#include "statichuff/statichuff.h"

 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"

+#include "zerogrouping/zerogrouping.h"
+#include "statichuff/statichuff.h"

 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>


@@ -11,6 +12,7 @@ int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;
 {      
        int cflag = 0;
        int dflag = 0;

+       int zflag = 0;

        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;
        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;


@@ -18,7 +20,7 @@ int main(int argc, char* argv[])
        int ch;
        t_BlockSort *bs;
                        
        int ch;
        t_BlockSort *bs;
                        

-       while ((ch = getopt(argc, argv, "cdt:p:")) != -1) { 
+       while ((ch = getopt(argc, argv, "cdzt:p:")) != -1) { 

                 
                switch (ch) { 
                        case 'c': cflag = 1; 
                 
                switch (ch) { 
                        case 'c': cflag = 1; 


@@ -27,6 +29,9 @@ int main(int argc, char* argv[])
                        case 'd': dflag = 1; 
                                          break; 
 
                        case 'd': dflag = 1; 
                                          break; 
 

+                       case 'z': zflag = 1; 
+                                         break; 
+

                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 
                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 


@@ -83,8 +88,22 @@ int main(int argc, char* argv[])
 
                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(unsigned long int), i+sizeof(unsigned long int));
 
                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        mtf = jacu_mtf(salida+sizeof(unsigned long int), i+sizeof(unsigned long int));

-                       for(j=0; j<i; j++)
-                               fputc(mtf[j], fp_out);
+
+                       /* Si me lo piden, aplico ZG. */
+                       if (zflag)
+                       {
+                               size_t len;
+                               char buff[2];
+                               ZG zg;
+                               zg_init(&zg);
+                               for (j = 0; j < i; ++j)
+                                       if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
+                       }
+                       else
+                       {
+                               for(j=0; j<i; j++)
+                                       fputc(mtf[j], fp_out);
+                       }

                        free(mtf);
                }
 
                        free(mtf);
                }