Morphing sfrsd toward ftrsd...

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6241 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

CMakeLists.txt

@@ -406,15 +406,15 @@ set (wsjt_FSRCS
   )
 
 set (ka9q_CSRCS
-  lib/sfrsd2/decode_rs.c
-  lib/sfrsd2/encode_rs.c
-  lib/sfrsd2/init_rs.c
+  lib/ftrsd/decode_rs.c
+  lib/ftrsd/encode_rs.c
+  lib/ftrsd/init_rs.c
   )
 set_source_files_properties (${ka9q_CSRCS} PROPERTIES COMPILE_FLAGS -Wno-sign-compare)
 
 set (wsjt_CSRCS
   ${ka9q_CSRCS}
-  lib/sfrsd2/sfrsd2.c
+  lib/ftrsd/ftrsd2.c
   lib/gran.c
   lib/igray.c
   lib/wsprd/nhash.c

lib/Makefile.jt65

@@ -37,7 +37,7 @@ OBJS1 = astrosub.o astro0.o astro.o sun.o coord.o tmoonsub.o \
 	symspec.o analytic.o db.o \
 	encode232.o interleave9.o\
 	entail.o fano232.o gran.o sync9.o decjt9.o \
-	fil3.o decoder.o timer.o \
+	fil3.o decoder.o timer.o exp_decode65.o fqso_first.o \
 	twkfreq.o symspec2.o shell.o sync65.o peakup.o slope.o xcor.o\
 	fillcom.o chkss2.o zplot9.o flat1.o flat2.o \
 	jt65a.o symspec65.o flat65.o ccf65.o decode65a.o \

lib/extract.f90

@@ -64,10 +64,10 @@ subroutine extract(s3,nadd,nqd,ntrials,naggressive,ndepth,nexp_decode,   &
   ntry=0
 
   nverbose=0
-  call timer('sfrsd   ',0)
-  call sfrsd2(mrsym,mrprob,mr2sym,mr2prob,ntrials,nverbose,correct,   &
+  call timer('ftrsd   ',0)
+  call ftrsd2(mrsym,mrprob,mr2sym,mr2prob,ntrials,nverbose,correct,   &
        param,indx,tt,ntry)
-  call timer('sfrsd   ',1)
+  call timer('ftrsd   ',1)
   ncandidates=param(0)
   nhard=param(1)
   nsoft=param(2)

lib/ftrsd/Makefile

@@ -22,20 +22,20 @@ CFLAGS = -I. -DWIN32 -DWin32 -DBIGSYM -DHAVE_STRUCT_TIMESPEC
 %.o: %.F90
 	${FC} ${FFLAGS} -c $<
 
-all:    libsfrsd.a
+all:    libftrsd.a
 
-OBJS1 = extract2.o sfrsd2.o init_rs_int.o encode_rs_int.o decode_rs_int.o
-libsfrsd.a: $(OBJS1)
-	ar cr libsfrsd.a $(OBJS1)
-	ranlib libsfrsd.a
-	cp libsfrsd.a ..
+OBJS1 = extract2.o ftrsd2.o init_rs_int.o encode_rs_int.o decode_rs_int.o
+libftrsd.a: $(OBJS1)
+	ar cr libftrsd.a $(OBJS1)
+	ranlib libftrsd.a
+	cp libftrsd.a ..
 
 # Build rsdtest
 OBJS2 = rsdtest.o 
 rsdtest: $(OBJS2) ../libjt.a
-	$(FC) -o rsdtest $(OBJS2) libsfrsd.a ../libjt.a ../libpthreadGC2.a
+	$(FC) -o rsdtest $(OBJS2) libftrsd.a ../libjt.a ../libpthreadGC2.a
 
-sfrsd: sfrsd.o encode_rs_int.o decode_rs_int.o init_rs_int.o
+ftrsd: ftrsd.o encode_rs_int.o decode_rs_int.o init_rs_int.o
 	gcc -g -o $@ $^
 
 encode_rs_int.o: encode_rs.c
@@ -50,4 +50,4 @@ init_rs_int.o: init_rs.c
 .PHONY : clean
 
 clean:
-	rm -rf *.o libjt.a rsdtest sfrsd
+	rm -rf *.o libjt.a rsdtest ftrsd

lib/ftrsd/extract2.f90

@@ -52,7 +52,7 @@ subroutine extract2(s3,nadd,ntrials,param,msg)
   call interleave63(mr2prob,-1)
 
   nverbose=0
-  call sfrsd2(mrsym,mrprob,mr2sym,mr2prob,ntrials,nverbose,correct,   &
+  call ftrsd2(mrsym,mrprob,mr2sym,mr2prob,ntrials,nverbose,correct,   &
        param,indx,tt,ntry)
   ncandidates=param(0)
   nhard=param(1)

lib/ftrsd/ftrsd2.c

@@ -1,5 +1,5 @@
 /*
- sfrsd2.c
+ ftrsd2.c
  
  A soft-decision decoder for the JT65 (63,12) Reed-Solomon code.
  
@@ -23,7 +23,7 @@
 
 static void *rs;
 
-void sfrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[], 
+void ftrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[], 
 	     int* ntrials0, int* verbose0, int correct[], int param[],
 	     int indexes[], double tt[], int ntry[])
 {
@@ -101,9 +101,9 @@ void sfrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[],
 */
 
   if(verbose) {
-    logfile=fopen("/tmp/sfrsd.log","a");
+    logfile=fopen("/tmp/ftrsd.log","a");
     if( !logfile ) {
-      printf("Unable to open sfrsd.log\n");
+      printf("Unable to open ftrsd.log\n");
       exit(1);
     }
   }

lib/ftrsd/sfrsd2.h

@@ -1,3 +1,3 @@
-void sfrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[], 
+void ftrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[], 
 	     int* ntrials0, int* verbose0, int correct[], int param[],
 	     int indexes[], double tt[], int ntry[]);