Thread: [marf-cvs] marf/src/marf/Preprocessing/WaveletFilters WaveletFilter.java, 1.2, 1.3
Brought to you by:
mokhov
From: Serguei A. M. <mo...@us...> - 2011-12-05 03:28:49
|
Update of /cvsroot/marf/marf/src/marf/Preprocessing/WaveletFilters In directory vz-cvs-4.sog:/tmp/cvs-serv31873/marf/Preprocessing/WaveletFilters Modified Files: WaveletFilter.java Log Message: Perform a debugging pass of translation fixes from C++ and Matlab of the code inspired from. Align more with our coding standards. Test. Preliminary results with the current separating DWT are not encouraging suggesting likely the implementation is still buggy. Will look at it later, but at least it's able to complete the pipeline. What's interesting e.g. in MARFCAT experiments is that 2nd best is ~5 times better than the first guess. Index: WaveletFilter.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Preprocessing/WaveletFilters/WaveletFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaveletFilter.java 21 Nov 2011 21:14:24 -0000 1.2 --- WaveletFilter.java 5 Dec 2011 03:28:46 -0000 1.3 *************** *** 83,91 **** ( getClass(), ! new StringBuffer("position prior entry to while(): ").append(iPosition) .append(", sample length: ").append(padSample.length) ); ! while(iPosition < padSample.length) { /* --- 83,92 ---- ( getClass(), ! new StringBuffer("position prior entry to while(): ") ! .append(iPosition) .append(", sample length: ").append(padSample.length) ); ! //while(iPosition < padSample.length) { /* *************** *** 118,124 **** //Algorithms.FFT.doFFT(adOutputReal, adOutputImag, adBuffer, adBufferImag, -1); double[] adFiltered = Algorithms.Wavelet.idwt(adDWTCoeffs, 6, Algorithms.Wavelet.sf); ! ! Arrays.copy(padFiltered, 0, adFiltered); // Copy & normalize --- 119,127 ---- //Algorithms.FFT.doFFT(adOutputReal, adOutputImag, adBuffer, adBufferImag, -1); double[] adFiltered = Algorithms.Wavelet.idwt(adDWTCoeffs, 6, Algorithms.Wavelet.sf); ! System.err.println("adFiltered" + adFiltered + ",padFiltered="+padFiltered); ! System.err.println("adFiltered.l" + adFiltered.length + ",padFiltered.l="+padFiltered.length); + //Arrays.copy(padFiltered, 0, adFiltered); + Arrays.copy(padFiltered, 0, adFiltered, 0, padFiltered.length <= adFiltered.length ? padFiltered.length : adFiltered.length); // Copy & normalize |