[marf-cvs] marf/src/marf/FeatureExtraction/FFT FFT.java,1.38,1.39

[Serguei A. M. <mo...@us...>]

Update of /cvsroot/marf/marf/src/marf/FeatureExtraction/FFT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4663/marf/FeatureExtraction/FFT

Modified Files:
	FFT.java 
Log Message:
While browsing commit diffs online, I have spotted a bug I inadvertedly
introduced via copy-paste while applying naming conventions -- replaced
one variable with another. This may account for the recent FFT breakage.


Index: FFT.java
===================================================================
RCS file: /cvsroot/marf/marf/src/marf/FeatureExtraction/FFT/FFT.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FFT.java	21 May 2005 18:38:57 -0000	1.38
--- FFT.java	24 May 2005 03:29:15 -0000	1.39
***************
*** 85,89 ****
  				for(i = 0; i < iChunkSize; i++)
  				{
! 					if(iNbrDataRecv >= iChunkSize)
  					{
  						iNbrDataRecv = this.oPreprocessing.getSample().getNextChunk(adSampleChunk);
--- 85,89 ----
  				for(i = 0; i < iChunkSize; i++)
  				{
! 					if(iWindowPos >= iChunkSize)
  					{
  						iNbrDataRecv = this.oPreprocessing.getSample().getNextChunk(adSampleChunk);
***************
*** 98,106 ****
  					}
  
! 					//SampleArray[i] = SampleChunk[windowPos++] * hamming(i, ChunkSize);
  					iWindowPos++;
  				}
  
! 				//XXX: hamming(SampleChunk);
  				adSampleArray = (double[])adSampleChunk.clone();
  				hamming(adSampleArray);
--- 98,106 ----
  					}
  
! 					//adSampleArray[i] = adSampleChunk[iWindowPos++] * hamming(i, iChunkSize);
  					iWindowPos++;
  				}
  
! 				//XXX: hamming(adSampleChunk);
  				adSampleArray = (double[])adSampleChunk.clone();
  				hamming(adSampleArray);
***************
*** 112,116 ****
  					iWindowPos += iChunkSize;
  
! 				//XXX: NormalFFT(SampleChunk, adMagnitude, adPhaseAngle);
  				normalFFT(adSampleArray, adMagnitude, adPhaseAngle);
  
--- 112,116 ----
  					iWindowPos += iChunkSize;
  
! 				//XXX: normalFFT(adSampleChunk, adMagnitude, adPhaseAngle);
  				normalFFT(adSampleArray, adMagnitude, adPhaseAngle);