[Commit-gnuradio] r3424 - gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src

[jcorgan]

Author: jcorgan
Date: 2006-08-26 10:12:34 -0600 (Sat, 26 Aug 2006)
New Revision: 3424

Modified:
   
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/Makefile.am
   gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/hunter.cc
   gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/search.cc
Log:
Experimenting with faster, weaker outlier effect distribution.

Trial fix for "BUSY" bug.

Fixes for VPATH build.


Modified: 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/Makefile.am  
    2006-08-26 05:44:37 UTC (rev 3423)
+++ 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/Makefile.am  
    2006-08-26 16:12:34 UTC (rev 3424)
@@ -37,6 +37,11 @@
 hunter_LDADD = \
     $(FTDI_LIBS) \
     $(WX_LIBS)
+
+BUILT_SOURCES = \
+    $(top_builddir)/src/resource.cc
     
-resource.cc: hunter.xrc
-       wxrc -c -o resource.cc hunter.xrc
+$(top_builddir)/src/resource.cc: hunter.xrc
+       wxrc -c -o $(top_builddir)/src/resource.cc $(top_srcdir)/src/hunter.xrc
+
+MOSTLYCLEANFILES = $(BUILT_SOURCES)
\ No newline at end of file

Modified: 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/hunter.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/hunter.cc    
    2006-08-26 05:44:37 UTC (rev 3423)
+++ 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/hunter.cc    
    2006-08-26 16:12:34 UTC (rev 3424)
@@ -747,7 +747,7 @@
     str.Printf(_T("%i"), m_log->Count());
     XRCCTRL(*this, "search_count_text", wxStaticText)->SetLabel(str);
 
-    str.Printf(_T("%s"), m_search.Busy() ? "BUSY" : "");
+    str.Printf(_T("%s"), m_search.Busy() ? _T("BUSY") : _T(""));
     XRCCTRL(*this, "search_status_text", wxStaticText)->SetLabel(str);
 
     str.Printf(_T("%i"), m_search.Mode());

Modified: 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/search.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/search.cc    
    2006-08-26 05:44:37 UTC (rev 3423)
+++ 
gnuradio/branches/developers/jcorgan/wip/ezdop/src/host/hunter/src/search.cc    
    2006-08-26 16:12:34 UTC (rev 3424)
@@ -197,10 +197,12 @@
         sample.CalcError(trial, angle, ierror, qerror);
 
         // Wrapped cauchy distribution
-        float p = m_scale;
-        float likelihood = (1-p*p)/(1+p*p-2*p*cos(angle*M_PI/180.0));
+        //float p = m_scale;
+        //float likelihood = (1-p*p)/(1+p*p-2*p*cos(angle*M_PI/180.0));
+       //trial_error += -log(likelihood)*sample.Strength();
 
-        trial_error += -log(likelihood)*sample.Strength();
+       // Adjusted exponential distribution
+       trial_error += sqrt(1+angle*angle)*sample.Strength();
         wsum += sample.Strength();
     }