[xiph-commits] r17946 - trunk/ghost/monty/chirp

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2011-04-30 11:48:59 -0700 (Sat, 30 Apr 2011)
New Revision: 17946

Modified:
   trunk/ghost/monty/chirp/chirptest.c
Log:
Update tests for chirptool


Modified: trunk/ghost/monty/chirp/chirptest.c
===================================================================
--- trunk/ghost/monty/chirp/chirptest.c	2011-04-30 14:33:54 UTC (rev 17945)
+++ trunk/ghost/monty/chirp/chirptest.c	2011-04-30 18:48:59 UTC (rev 17946)
@@ -1132,7 +1132,7 @@
     /* fit_ddA */       0,
     /* nonlinear */     0,
     /* W_alpha */       1.,
-    /* dW_alpha */      1.75,
+    /* dW_alpha */      1.,
     /* symm_norm */     0,
     /* bound_zero */    0,
 
@@ -1182,13 +1182,13 @@
 
   /* Graphs for dW vs W ****************************************/
 
-  //w_e("linear-dW-vs-W",&arg);
+  w_e("linear-dW-vs-W",&arg);
   arg.fit_nonlinear=1;
   arg.subtitle1="Partial nonlinear estimation, no ddA fit";
-  //w_e("partial-nonlinear-dW-vs-W",&arg);
+  w_e("partial-nonlinear-dW-vs-W",&arg);
   arg.subtitle1="Full nonlinear estimation, no ddA fit";
   arg.fit_nonlinear=2;
-  //w_e("full-nonlinear-dW-vs-W",&arg);
+  w_e("full-nonlinear-dW-vs-W",&arg);
 
   /* Graphs for W estimate distance vs W ************************/
 
@@ -1201,14 +1201,14 @@
   arg.min_chirp_dW=0.;
   arg.max_chirp_dW=0.;
 
-  //w_e("linear-estW-vs-W",&arg);
+  w_e("linear-estW-vs-W",&arg);
   arg.subtitle1="Partial nonlinear estimation, no ddA fit";
   arg.subtitle2="chirp: A=1.0, dA=dW=0., swept phase | estimate A=P=dA=dW=0";
   arg.fit_nonlinear=1;
-  //w_e("partial-nonlinear-estW-vs-W",&arg);
+  w_e("partial-nonlinear-estW-vs-W",&arg);
   arg.subtitle1="Full nonlinear estimation, no ddA fit";
   arg.fit_nonlinear=2;
-  //w_e("full-nonlinear-estW-vs-W",&arg);
+  w_e("full-nonlinear-estW-vs-W",&arg);
   arg.fit_nonlinear=0;
 
   /* graphs for different windows */
@@ -1220,23 +1220,23 @@
   arg.subtitle1="Linear estimation, no ddA fit";
   arg.window = window_functions.rectangle;
   arg.subtitle3 = "rectangular window";
-  //w_e("linear-estW-vs-W-rectangular",&arg);
+  w_e("linear-estW-vs-W-rectangular",&arg);
 
   arg.window = window_functions.sine;
   arg.subtitle3 = "sine window";
-  //w_e("linear-estW-vs-W-sine",&arg);
+  w_e("linear-estW-vs-W-sine",&arg);
 
   arg.window = window_functions.hanning;
   arg.subtitle3 = "hanning window";
-  //w_e("linear-estW-vs-W-hanning",&arg);
+  w_e("linear-estW-vs-W-hanning",&arg);
 
   arg.window = window_functions.tgauss_deep;
   arg.subtitle3 = "sidelobeless triagular/gaussian window";
-  //w_e("linear-estW-vs-W-sidelobeless",&arg);
+  w_e("linear-estW-vs-W-unimodal",&arg);
 
   arg.window = window_functions.maxwell1;
   arg.subtitle3 = "maxwell (optimized) window";
-  //w_e("linear-estW-vs-W-maxwell",&arg);
+  w_e("linear-estW-vs-W-maxwell",&arg);
 
   arg.min_est_W = -15;
   arg.max_est_W =  15;
@@ -1257,7 +1257,7 @@
 
   arg.window = window_functions.tgauss_deep;
   arg.subtitle3 = "sidelobeless triagular/gaussian window";
-  w_e("full-nonlinear-estW-vs-W-sidelobeless",&arg);
+  w_e("full-nonlinear-estW-vs-W-unimodal",&arg);
 
   arg.window = window_functions.maxwell1;
   arg.subtitle3 = "maxwell (optimized) window";