Removing unused parameter

kulvait · Sep 16, 2019 · d731791 · d731791
1 parent 594e357
commit d731791
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/multiscaler/decompose.cpp b/multiscaler/decompose.cpp
@@ -10,11 +10,11 @@ using std::cerr;
 using std::endl;
 
 int main(int argc, char *argv[]) {
-  float ratio = atof(pick_option(&argc, argv, "r", "2."));
+  int ratio = 2.;
   bool usage = pick_option(&argc, argv, "h", nullptr);
   int type = atoi(pick_option(&argc, argv, "t", "0"));
   if (argc != 5 || usage) {
-    cerr << "Usage: " << argv[0] << " input prefix levels suffix [-r ratio] [-t type: 0=DCT, 1=Gaussian, 2=Lanczos]" << endl;
+    cerr << "Usage: " << argv[0] << " input prefix levels suffix [-t type: 0=DCT, 1=Gaussian, 2=Lanczos]" << endl;
     exit(EXIT_FAILURE);
   }
   string input = argv[1];

diff --git a/src/utils/VBM3Ddenoising_OF_multiscale.sh b/src/utils/VBM3Ddenoising_OF_multiscale.sh
@@ -39,13 +39,9 @@ if [ -n "$9" ]; then
     MSTYPE=$9
 fi
 if [ -n "${10}" ]; then
-    R_PYR=${10}
-fi
-if [ -n "${11}" ]; then
-    PAR_PYR=${11}
+    PAR_PYR=${10}
 fi
 
-DEC_ARGS="-r ${R_PYR}"
 MS_ARGS="-c ${PAR_PYR}"
 
 # Clean noisy
@@ -72,7 +68,7 @@ done
 wait
 for ((frame=FIRST; frame<=LAST; ++frame))
 do
-    $PATH_MULTISCALE/recompose denoised/level_ ${LEVELS} _$(printf "%04d" $frame).tiff $(printf $OUT/$OUTPUT $frame) -t $MSTYPE
+    $PATH_MULTISCALE/recompose denoised/level_ ${LEVELS} _$(printf "%04d" $frame).tiff $(printf $OUT/$OUTPUT $frame) -t $MSTYPE ${MS_ARGS}
 done
 
 ./psnr -i $OUT/$OUTPUT -r ${INPUT} -f ${FIRST} -l ${LAST} > $OUT/psnr.txt

diff --git a/src/utils/VBM3Ddenoising_multiscale.sh b/src/utils/VBM3Ddenoising_multiscale.sh
@@ -22,7 +22,6 @@ LEVELS=3
 FIRST=1
 LAST=100
 MSTYPE=0
-R_PYR=2   
 PAR_PYR=0.7
 
 
@@ -39,13 +38,9 @@ if [ -n "$9" ]; then
     MSTYPE=$9
 fi
 if [ -n "${10}" ]; then
-    R_PYR=${10}
-fi
-if [ -n "${11}" ]; then
-    PAR_PYR=${11}
+    PAR_PYR=${10}
 fi
 
-DEC_ARGS="-r ${R_PYR}"
 MS_ARGS="-c ${PAR_PYR}"
 
 # Clean noisy
@@ -72,7 +67,7 @@ done
 wait
 for ((frame=FIRST; frame<=LAST; ++frame))
 do
-    $PATH_MULTISCALE/recompose denoised/level_ ${LEVELS} _$(printf "%04d" $frame).tiff $(printf $OUT/$OUTPUT $frame) -t $MSTYPE
+    $PATH_MULTISCALE/recompose denoised/level_ ${LEVELS} _$(printf "%04d" $frame).tiff $(printf $OUT/$OUTPUT $frame) -t $MSTYPE ${MS_ARGS}
 done
 
 ./psnr -i $OUT/$OUTPUT -r ${INPUT} -f ${FIRST} -l ${LAST} > $OUT/psnr.txt