Loading ...
Sorry, an error occurred while loading the content.
 

marf-cvs Digest, Vol 18, Issue 2

Expand Messages
  • marf-cvs-bounces@lists.sourceforge.net
    Send marf-cvs mailing list submissions to marf-cvs@lists.sourceforge.net To subscribe or unsubscribe via the World Wide Web, visit
    Message 1 of 1 , Nov 16, 2009
      Send marf-cvs mailing list submissions to
      marf-cvs@...

      To subscribe or unsubscribe via the World Wide Web, visit
      https://lists.sourceforge.net/lists/listinfo/marf-cvs
      or, via email, send a message with subject or body 'help' to
      marf-cvs-request@...

      You can reach the person managing the list at
      marf-cvs-owner@...

      When replying, please edit your Subject line so it is more specific
      than "Re: Contents of marf-cvs digest..."


      The MARF CVS Commit Log Digest
      Dispatched daily or when the size reaches 150k
      ----------------------------------------------

      Today's Topics:

      1. marf/src/marf/Stats/StatisticalEstimators/Smoothing
      AddDelta.java, 1.33.6.1, 1.33.6.2 GoodTuring.java, 1.20.6.1,
      1.20.6.2 ISmoothing.java, 1.2.6.1, 1.2.6.2 WittenBell.java,
      1.20.6.1, 1.20.6.2 (Serguei A. Mokhov)
      2. marf/src/marf/gui GUIException.java, 1.1.4.1, 1.1.4.2
      Spectrogram.java, 1.30.8.1, 1.30.8.2 WaveGrapher.java, 1.15.6.1,
      1.15.6.2 (Serguei A. Mokhov)
      3. marf/src/marf/FeatureExtraction/MinMaxAmplitudes
      MinMaxAmplitudes.java, 1.14.4.1, 1.14.4.2 (Serguei A. Mokhov)
      4. marf/src/marf/Stats Ngram.java, 1.15.6.1, 1.15.6.2
      Observation.java, 1.12.6.1, 1.12.6.2 ProbabilityTable.java,
      1.40.6.1, 1.40.6.2 StatisticalObject.java, 1.16.4.1, 1.16.4.2
      WordStats.java, 1.20.6.1, 1.20.6.2 (Serguei A. Mokhov)
      5. marf/src/marf/Preprocessing Makefile, 1.7.4.1, 1.7.4.2
      Preprocessing.java, 1.47.4.1, 1.47.4.2 PreprocessingFactory.java,
      1.3.4.1, 1.3.4.2 (Serguei A. Mokhov)
      6. marf/src/marf/Storage ByteArrayFileReader.java, 1.1.4.1,
      1.1.4.2 Cluster.java, 1.14.6.1, 1.14.6.2 Database.java, 1.10.6.1,
      1.10.6.2 FeatureSet.java, 1.15.4.1, 1.15.4.2 ISampleLoader.java,
      1.13.2.1, 1.13.2.2 IStorageManager.java, 1.11.6.1, 1.11.6.2
      MARFAudioFileFormat.java, 1.13.4.1, 1.13.4.2 ModuleParams.java,
      1.18.4.1, 1.18.4.2 ResultSet.java, 1.21.4.1, 1.21.4.2
      Sample.java, 1.47.4.1, 1.47.4.2 SampleLoader.java, 1.27.2.1,
      1.27.2.2 SampleLoaderFactory.java, 1.2.4.1, 1.2.4.2
      StorageManager.java, 1.31.4.1, 1.31.4.2 TrainingSample.java,
      1.10.6.1, 1.10.6.2 TrainingSet.java, 1.45.4.1, 1.45.4.2
      (Serguei A. Mokhov)
      7. marf/src/marf/Preprocessing/FFTFilter BandpassFilter.java,
      1.25.4.1, 1.25.4.2 FFTFilter.java, 1.35.4.1, 1.35.4.2
      HighFrequencyBoost.java, 1.28.4.1, 1.28.4.2 HighPassFilter.java,
      1.17.4.1, 1.17.4.2 LowPassFilter.java, 1.17.4.1, 1.17.4.2
      Makefile, 1.3.6.1, 1.3.6.2 (Serguei A. Mokhov)
      8. marf/src/marf/math ComplexMatrix.java, 1.11.4.1, 1.11.4.2
      ComplexNumber.java, 1.2.4.1, 1.2.4.2 ComplexVector.java, 1.2.4.1,
      1.2.4.2 MathException.java, 1.5.8.1, 1.5.8.2 Matrix.java,
      1.46.4.1, 1.46.4.2 Vector.java, 1.13.4.1, 1.13.4.2 (Serguei A. Mokhov)
      9. marf/src/marf/util Arrays.java, 1.38.4.2, 1.38.4.3
      BaseThread.java, 1.16.10.1, 1.16.10.2 ByteUtils.java, 1.6.10.1,
      1.6.10.2 Debug.java, 1.17.4.1, 1.17.4.2 ExpandedThreadGroup.java,
      1.12.6.1, 1.12.6.2 FreeVector.java, 1.12.8.1, 1.12.8.2
      InvalidSampleFormatException.java, 1.11.6.1, 1.11.6.2
      Logger.java, 1.9.4.1, 1.9.4.2 MARFException.java, 1.19.8.1,
      1.19.8.2 Makefile, 1.4.4.1, 1.4.4.2 Matrix.java, 1.14.8.1,
      1.14.8.2 NotImplementedException.java, 1.14.8.1, 1.14.8.2
      OptionFileLoader.java, 1.1.4.1, 1.1.4.2 OptionProcessor.java,
      1.37.4.1, 1.37.4.2 SortComparator.java, 1.9.6.1, 1.9.6.2
      (Serguei A. Mokhov)
      10. marf/src/marf/nlp Makefile,1.5.6.1,1.5.6.2 (Serguei A. Mokhov)
      11. marf/src/marf/util/comparators FrequencyComparator.java,
      1.14.8.1, 1.14.8.2 RankComparator.java, 1.13.8.1, 1.13.8.2
      ResultComparator.java, 1.14.8.1, 1.14.8.2 (Serguei A. Mokhov)
      12. apps/ProbabilisticParsingApp Makefile, 1.34, 1.34.4.1
      ProbabilisticParsingApp.java, 1.36, 1.36.4.1 testing.sh, 1.38,
      1.38.4.1 (Serguei A. Mokhov)
      13. apps/SpeakerIdentApp Makefile, 1.31, 1.31.4.1 README, 1.13,
      1.13.2.1 SpeakerIdentApp.java, 1.63, 1.63.4.1 speakers.txt, 1.32,
      1.32.4.1 testing.bat, 1.12, 1.12.4.1 testing.sh, 1.42, 1.42.4.1
      (Serguei A. Mokhov)
      14. apps/TestNN Makefile,1.13,1.13.4.1 (Serguei A. Mokhov)
      15. apps/TestLPC Makefile,1.15,1.15.4.1 (Serguei A. Mokhov)
      16. apps/ZipfLawApp Makefile, 1.25, 1.25.4.1 ZipfLaw.java, 1.28,
      1.28.4.1 testing.sh, 1.11, 1.11.4.1 (Serguei A. Mokhov)
      17. apps Makefile,1.19,1.19.4.1 README,1.6,1.6.4.1 (Serguei A. Mokhov)
      18. apps/Regression Makefile,1.11,1.11.4.1 (Serguei A. Mokhov)
      19. apps/TestMath Makefile, 1.14, 1.14.4.1 MathTestApp.java,
      1.21, 1.21.4.1 (Serguei A. Mokhov)
      20. apps/TestLoaders Makefile,1.11,1.11.4.1 (Serguei A. Mokhov)
      21. apps/TestWaveLoader Makefile, 1.15, 1.15.4.1
      TestWaveLoader.java, 1.14, 1.14.4.1 (Serguei A. Mokhov)
      22. apps/TestLoaders/expected sine.out,1.2,1.2.8.1 (Serguei A. Mokhov)
      23. apps/ProbabilisticParsingApp/expected
      grammar.asmt.txt-case-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-eos-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-eos.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-case.log, 1.2, 1.2.4.1
      grammar.asmt.txt-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-eos-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-eos-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-eos.log, 1.2, 1.2.4.1
      grammar.asmt.txt-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-eos-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-eos.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-case.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-eos-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-eos-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-eos.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-num-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-num.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse-quote.log, 1.2, 1.2.4.1
      grammar.asmt.txt-parse.log, 1.3, 1.3.4.1
      grammar.asmt.txt-quote.log, 1.2, 1.2.4.1 grammar.asmt.txt.log,
      1.2, 1.2.4.1 grammar.extended.txt-case-eos-num-quote.log, 1.2,
      1.2.4.1 grammar.extended.txt-case-eos-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-case-eos.log, 1.2, 1.2.4.1
      grammar.extended.txt-case-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-case-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-case-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-case.log, 1.2, 1.2.4.1
      grammar.extended.txt-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-eos-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-eos-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-eos.log, 1.2, 1.2.4.1
      grammar.extended.txt-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-eos-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-eos.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-case.log, 1.3, 1.3.4.1
      grammar.extended.txt-parse-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-eos-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-eos-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-eos.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-num-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-num.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt-parse.log, 1.4, 1.4.4.1
      grammar.extended.txt-quote.log, 1.2, 1.2.4.1
      grammar.extended.txt.log, 1.2, 1.2.4.1
      grammar.original.txt-case-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-case-eos-num.log, 1.2, 1.2.4.1
      grammar.original.txt-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-case-eos.log, 1.2, 1.2.4.1
      grammar.original.txt-case-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-case-num.log, 1.2, 1.2.4.1
      grammar.original.txt-case-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-case.log, 1.2, 1.2.4.1
      grammar.original.txt-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-eos-num.log, 1.2, 1.2.4.1
      grammar.original.txt-eos-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-eos.log, 1.2, 1.2.4.1
      grammar.original.txt-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-num.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-eos-num.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-eos-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-eos.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-num.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-case.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-eos-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-eos-num.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-eos-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-eos.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-num-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-num.log, 1.2, 1.2.4.1
      grammar.original.txt-parse-quote.log, 1.2, 1.2.4.1
      grammar.original.txt-parse.log, 1.3, 1.3.4.1
      grammar.original.txt-quote.log, 1.2, 1.2.4.1
      grammar.original.txt.log, 1.2, 1.2.4.1 (Serguei A. Mokhov)


      ----------------------------------------------------------------------

      Message: 1
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs]
      marf/src/marf/Stats/StatisticalEstimators/Smoothing AddDelta.java,
      1.33.6.1, 1.33.6.2 GoodTuring.java, 1.20.6.1, 1.20.6.2
      ISmoothing.java, 1.2.6.1, 1.2.6.2 WittenBell.java, 1.20.6.1, 1.20.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007ty-5J@...>

      Update of /cvsroot/marf/marf/src/marf/Stats/StatisticalEstimators/Smoothing
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/Stats/StatisticalEstimators/Smoothing

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      AddDelta.java GoodTuring.java ISmoothing.java WittenBell.java
      Log Message:
      Sync core components from the HEAD.









      ------------------------------

      Message: 2
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/gui GUIException.java, 1.1.4.1,
      1.1.4.2 Spectrogram.java, 1.30.8.1, 1.30.8.2 WaveGrapher.java,
      1.15.6.1, 1.15.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007uT-DZ@...>

      Update of /cvsroot/marf/marf/src/marf/gui
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/gui

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      GUIException.java Spectrogram.java WaveGrapher.java
      Log Message:
      Sync core components from the HEAD.








      ------------------------------

      Message: 3
      Date: Tue, 17 Nov 2009 05:09:59 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/FeatureExtraction/MinMaxAmplitudes
      MinMaxAmplitudes.java, 1.14.4.1, 1.14.4.2
      To: marf-cvs@...
      Message-ID: <E1NAGKF-0007sP-Jo@...>

      Update of /cvsroot/marf/marf/src/marf/FeatureExtraction/MinMaxAmplitudes
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/FeatureExtraction/MinMaxAmplitudes

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      MinMaxAmplitudes.java
      Log Message:
      Sync core components from the HEAD.






      ------------------------------

      Message: 4
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Stats Ngram.java, 1.15.6.1, 1.15.6.2
      Observation.java, 1.12.6.1, 1.12.6.2 ProbabilityTable.java, 1.40.6.1,
      1.40.6.2 StatisticalObject.java, 1.16.4.1, 1.16.4.2 WordStats.java,
      1.20.6.1, 1.20.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007tj-22@...>

      Update of /cvsroot/marf/marf/src/marf/Stats
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/Stats

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Ngram.java Observation.java ProbabilityTable.java
      StatisticalObject.java WordStats.java
      Log Message:
      Sync core components from the HEAD.










      ------------------------------

      Message: 5
      Date: Tue, 17 Nov 2009 05:09:59 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Preprocessing Makefile, 1.7.4.1,
      1.7.4.2 Preprocessing.java, 1.47.4.1, 1.47.4.2
      PreprocessingFactory.java, 1.3.4.1, 1.3.4.2
      To: marf-cvs@...
      Message-ID: <E1NAGKF-0007sX-Oq@...>

      Update of /cvsroot/marf/marf/src/marf/Preprocessing
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/Preprocessing

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile Preprocessing.java PreprocessingFactory.java
      Log Message:
      Sync core components from the HEAD.








      ------------------------------

      Message: 6
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Storage ByteArrayFileReader.java,
      1.1.4.1, 1.1.4.2 Cluster.java, 1.14.6.1, 1.14.6.2 Database.java,
      1.10.6.1, 1.10.6.2 FeatureSet.java, 1.15.4.1, 1.15.4.2
      ISampleLoader.java, 1.13.2.1, 1.13.2.2 IStorageManager.java, 1.11.6.1,
      1.11.6.2 MARFAudioFileFormat.java, 1.13.4.1, 1.13.4.2
      ModuleParams.java, 1.18.4.1, 1.18.4.2 ResultSet.java, 1.21.4.1,
      1.21.4.2 Sample.java, 1.47.4.1, 1.47.4.2 SampleLoader.java, 1.27.2.1,
      1.27.2.2 SampleLoaderFactory.java, 1.2.4.1, 1.2.4.2
      StorageManager.java, 1.31.4.1, 1.31.4.2 TrainingSample.java, 1.10.6.1,
      1.10.6.2 TrainingSet.java, 1.45.4.1, 1.45.4.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007u5-Bi@...>

      Update of /cvsroot/marf/marf/src/marf/Storage
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/Storage

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      ByteArrayFileReader.java Cluster.java Database.java
      FeatureSet.java ISampleLoader.java IStorageManager.java
      MARFAudioFileFormat.java ModuleParams.java ResultSet.java
      Sample.java SampleLoader.java SampleLoaderFactory.java
      StorageManager.java TrainingSample.java TrainingSet.java
      Log Message:
      Sync core components from the HEAD.








      Index: StorageManager.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Storage/StorageManager.java,v
      retrieving revision 1.31.4.1
      retrieving revision 1.31.4.2
      diff -C2 -d -r1.31.4.1 -r1.31.4.2
      *** StorageManager.java 9 Apr 2008 00:32:17 -0000 1.31.4.1
      --- StorageManager.java 17 Nov 2009 05:09:58 -0000 1.31.4.2
      ***************
      *** 330,335 ****
      try
      {
      ! FileOutputStream oFOS = new FileOutputStream(this.strFilename);
      ! GZIPOutputStream oGZOS = new GZIPOutputStream(oFOS);
      ObjectOutputStream oOOS = new ObjectOutputStream(oGZOS);

      --- 330,346 ----
      try
      {
      ! GZIPOutputStream oGZOS = null;
      !
      ! if(this.strFilename == null || "".equals(this.strFilename))
      ! {
      ! // Assume STDOUT if no filename specified.
      ! oGZOS = new GZIPOutputStream(System.out);
      ! }
      ! else
      ! {
      ! FileOutputStream oFOS = new FileOutputStream(this.strFilename);
      ! oGZOS = new GZIPOutputStream(oFOS);
      ! }
      !
      ObjectOutputStream oOOS = new ObjectOutputStream(oGZOS);

      ***************
      *** 358,363 ****
      try
      {
      ! FileOutputStream oFOS = new FileOutputStream(this.strFilename);
      ! ObjectOutputStream oOOS = new ObjectOutputStream(oFOS);

      oOOS.writeObject(this.oObjectToSerialize);
      --- 369,384 ----
      try
      {
      ! ObjectOutputStream oOOS = null;
      !
      ! if(this.strFilename == null || "".equals(this.strFilename))
      ! {
      ! // Assume STDOUT if no filename specified.
      ! oOOS = new ObjectOutputStream(System.out);
      ! }
      ! else
      ! {
      ! FileOutputStream oFOS = new FileOutputStream(this.strFilename);
      ! oOOS = new ObjectOutputStream(oFOS);
      ! }

      oOOS.writeObject(this.oObjectToSerialize);
      ***************
      *** 367,370 ****
      --- 388,392 ----
      catch(Exception e)
      {
      + e.printStackTrace(System.err);
      throw new StorageException(e);
      }
      ***************
      *** 500,505 ****
      try
      {
      ! FileInputStream oFIS = new FileInputStream(this.strFilename);
      ! ObjectInputStream oOIS = new ObjectInputStream(oFIS);

      this.oObjectToSerialize = (Serializable)oOIS.readObject();
      --- 522,537 ----
      try
      {
      ! ObjectInputStream oOIS = null;
      !
      ! if(this.strFilename == null || "".equals(this.strFilename))
      ! {
      ! // Assume STDOUT if no filename specified.
      ! oOIS = new ObjectInputStream(System.in);
      ! }
      ! else
      ! {
      ! FileInputStream oFIS = new FileInputStream(this.strFilename);
      ! oOIS = new ObjectInputStream(oFIS);
      ! }

      this.oObjectToSerialize = (Serializable)oOIS.readObject();
      ***************
      *** 563,568 ****
      try
      {
      ! FileInputStream oFIS = new FileInputStream(this.strFilename);
      ! GZIPInputStream oGZIS = new GZIPInputStream(oFIS);
      ObjectInputStream oOIS = new ObjectInputStream(oGZIS);

      --- 595,611 ----
      try
      {
      ! GZIPInputStream oGZIS = null;
      !
      ! if(this.strFilename == null || "".equals(this.strFilename))
      ! {
      ! // Assume STDOUT if no filename specified.
      ! oGZIS = new GZIPInputStream(System.in);
      ! }
      ! else
      ! {
      ! FileInputStream oFIS = new FileInputStream(this.strFilename);
      ! oGZIS = new GZIPInputStream(oFIS);
      ! }
      !
      ObjectInputStream oOIS = new ObjectInputStream(oGZIS);







      Index: TrainingSet.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Storage/TrainingSet.java,v
      retrieving revision 1.45.4.1
      retrieving revision 1.45.4.2
      diff -C2 -d -r1.45.4.1 -r1.45.4.2
      *** TrainingSet.java 9 Apr 2008 00:32:17 -0000 1.45.4.1
      --- TrainingSet.java 17 Nov 2009 05:09:58 -0000 1.45.4.2
      ***************
      *** 51,55 ****
      */
      // protected Vector oClusters = new Vector();
      ! protected Vector oTrainingSamples = new Vector();
      // protected Hashtable oTrainingSamples = new Hashtable();

      --- 51,55 ----
      */
      // protected Vector oClusters = new Vector();
      ! protected Vector<ITrainingSample> oTrainingSamples = new Vector<ITrainingSample>();
      // protected Hashtable oTrainingSamples = new Hashtable();

      ***************
      *** 93,97 ****
      * @return vector of training samples.
      */
      ! public final Vector getClusters()
      // public final Hashtable getClusters()
      {
      --- 93,97 ----
      * @return vector of training samples.
      */
      ! public final Vector<ITrainingSample> getClusters()
      // public final Hashtable getClusters()
      {
      ***************
      *** 405,409 ****
      oClone.oTrainingSamples =
      this.oTrainingSamples == null ?
      ! null : (Vector)this.oTrainingSamples.clone();

      // oClone.oTrainingSamples =
      --- 405,409 ----
      oClone.oTrainingSamples =
      this.oTrainingSamples == null ?
      ! null : (Vector<ITrainingSample>)this.oTrainingSamples.clone();

      // oClone.oTrainingSamples =






      ------------------------------

      Message: 7
      Date: Tue, 17 Nov 2009 05:09:59 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Preprocessing/FFTFilter
      BandpassFilter.java, 1.25.4.1, 1.25.4.2 FFTFilter.java, 1.35.4.1,
      1.35.4.2 HighFrequencyBoost.java, 1.28.4.1, 1.28.4.2
      HighPassFilter.java, 1.17.4.1, 1.17.4.2 LowPassFilter.java, 1.17.4.1,
      1.17.4.2 Makefile, 1.3.6.1, 1.3.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007tc-0H@...>

      Update of /cvsroot/marf/marf/src/marf/Preprocessing/FFTFilter
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/Preprocessing/FFTFilter

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      BandpassFilter.java FFTFilter.java HighFrequencyBoost.java
      HighPassFilter.java LowPassFilter.java Makefile
      Log Message:
      Sync core components from the HEAD.











      ------------------------------

      Message: 8
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/math ComplexMatrix.java, 1.11.4.1,
      1.11.4.2 ComplexNumber.java, 1.2.4.1, 1.2.4.2 ComplexVector.java,
      1.2.4.1, 1.2.4.2 MathException.java, 1.5.8.1, 1.5.8.2 Matrix.java,
      1.46.4.1, 1.46.4.2 Vector.java, 1.13.4.1, 1.13.4.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007ui-IU@...>

      Update of /cvsroot/marf/marf/src/marf/math
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/math

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      ComplexMatrix.java ComplexNumber.java ComplexVector.java
      MathException.java Matrix.java Vector.java
      Log Message:
      Sync core components from the HEAD.











      ------------------------------

      Message: 9
      Date: Tue, 17 Nov 2009 05:10:01 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/util Arrays.java, 1.38.4.2, 1.38.4.3
      BaseThread.java, 1.16.10.1, 1.16.10.2 ByteUtils.java, 1.6.10.1,
      1.6.10.2 Debug.java, 1.17.4.1, 1.17.4.2 ExpandedThreadGroup.java,
      1.12.6.1, 1.12.6.2 FreeVector.java, 1.12.8.1, 1.12.8.2
      InvalidSampleFormatException.java, 1.11.6.1, 1.11.6.2 Logger.java,
      1.9.4.1, 1.9.4.2 MARFException.java, 1.19.8.1, 1.19.8.2 Makefile,
      1.4.4.1, 1.4.4.2 Matrix.java, 1.14.8.1, 1.14.8.2
      NotImplementedException.java, 1.14.8.1, 1.14.8.2
      OptionFileLoader.java, 1.1.4.1, 1.1.4.2 OptionProcessor.java,
      1.37.4.1, 1.37.4.2 SortComparator.java, 1.9.6.1, 1.9.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKH-0007vZ-3O@...>

      Update of /cvsroot/marf/marf/src/marf/util
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/util

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Arrays.java BaseThread.java ByteUtils.java Debug.java
      ExpandedThreadGroup.java FreeVector.java
      InvalidSampleFormatException.java Logger.java
      MARFException.java Makefile Matrix.java
      NotImplementedException.java OptionFileLoader.java
      OptionProcessor.java SortComparator.java
      Log Message:
      Sync core components from the HEAD.





      Index: FreeVector.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/util/FreeVector.java,v
      retrieving revision 1.12.8.1
      retrieving revision 1.12.8.2
      diff -C2 -d -r1.12.8.1 -r1.12.8.2
      *** FreeVector.java 9 Apr 2008 00:32:25 -0000 1.12.8.1
      --- FreeVector.java 17 Nov 2009 05:09:58 -0000 1.12.8.2
      ***************
      *** 74,82 ****
      * @param poCollection collection for the vector elements.
      */
      ! public FreeVector(Collection poCollection)
      {
      super(poCollection);
      }
      !
      /**
      * Access an element of the vector given index.
      --- 74,83 ----
      * @param poCollection collection for the vector elements.
      */
      ! public FreeVector(Collection<Object> poCollection)
      {
      super(poCollection);
      }
      !
      !
      /**
      * Access an element of the vector given index.
      ***************
      *** 193,196 ****
      --- 194,198 ----
      if(piIndex >= size())
      {
      + //XXX:
      //???
      // 1 less than the index
      ***************
      *** 229,233 ****
      * @return a corresponding List reference.
      */
      ! public synchronized List subList(int piFromIndex, int piToIndex)
      {
      ensureIndexCapacity(piToIndex);
      --- 231,235 ----
      * @return a corresponding List reference.
      */
      ! public synchronized List<?> subList(int piFromIndex, int piToIndex)
      {
      ensureIndexCapacity(piToIndex);

      Index: Arrays.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/util/Arrays.java,v
      retrieving revision 1.38.4.2
      retrieving revision 1.38.4.3
      diff -C2 -d -r1.38.4.2 -r1.38.4.3
      *** Arrays.java 9 Apr 2008 00:32:24 -0000 1.38.4.2
      --- Arrays.java 17 Nov 2009 05:09:58 -0000 1.38.4.3
      ***************
      *** 1982,1986 ****
      * @since 0.3.0.3
      */
      ! public static java.util.List asList(Object[] paoObjects)
      {
      return java.util.Arrays.asList(paoObjects);
      --- 1982,1986 ----
      * @since 0.3.0.3
      */
      ! public static java.util.List<?> asList(Object[] paoObjects)
      {
      return java.util.Arrays.asList(paoObjects);








      Index: Debug.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/util/Debug.java,v
      retrieving revision 1.17.4.1
      retrieving revision 1.17.4.2
      diff -C2 -d -r1.17.4.1 -r1.17.4.2
      *** Debug.java 9 Apr 2008 00:32:25 -0000 1.17.4.1
      --- Debug.java 17 Nov 2009 05:09:58 -0000 1.17.4.2
      ***************
      *** 123,127 ****
      * @param pstrMsgString desired debug message to be issued
      */
      ! public static synchronized final void debug(final Class poClass, final String pstrMsgString)
      {
      debug
      --- 123,127 ----
      * @param pstrMsgString desired debug message to be issued
      */
      ! public static synchronized final void debug(final Class<?> poClass, final String pstrMsgString)
      {
      debug
      ***************
      *** 142,146 ****
      * @since 0.3.0.6
      */
      ! public static synchronized final void debug(final Class poClass, final Object poMsgObject)
      {
      debug(poClass, poMsgObject.toString());
      --- 142,146 ----
      * @since 0.3.0.6
      */
      ! public static synchronized final void debug(final Class<?> poClass, final Object poMsgObject)
      {
      debug(poClass, poMsgObject.toString());






      ------------------------------

      Message: 10
      Date: Tue, 17 Nov 2009 05:10:00 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/nlp Makefile,1.5.6.1,1.5.6.2
      To: marf-cvs@...
      Message-ID: <E1NAGKG-0007up-JH@...>

      Update of /cvsroot/marf/marf/src/marf/nlp
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/nlp

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile
      Log Message:
      Sync core components from the HEAD.






      ------------------------------

      Message: 11
      Date: Tue, 17 Nov 2009 05:10:01 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/util/comparators
      FrequencyComparator.java, 1.14.8.1, 1.14.8.2 RankComparator.java,
      1.13.8.1, 1.13.8.2 ResultComparator.java, 1.14.8.1, 1.14.8.2
      To: marf-cvs@...
      Message-ID: <E1NAGKH-0007vi-6l@...>

      Update of /cvsroot/marf/marf/src/marf/util/comparators
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/marf/src/marf/util/comparators

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      FrequencyComparator.java RankComparator.java
      ResultComparator.java
      Log Message:
      Sync core components from the HEAD.








      ------------------------------

      Message: 12
      Date: Tue, 17 Nov 2009 05:09:53 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/ProbabilisticParsingApp Makefile, 1.34,
      1.34.4.1 ProbabilisticParsingApp.java, 1.36, 1.36.4.1 testing.sh,
      1.38, 1.38.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKd-0007pA-A3@...>

      Update of /cvsroot/marf/apps/ProbabilisticParsingApp
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/ProbabilisticParsingApp

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile ProbabilisticParsingApp.java testing.sh
      Log Message:
      Sync core components from the HEAD.


      Index: ProbabilisticParsingApp.java
      ===================================================================
      RCS file: /cvsroot/marf/apps/ProbabilisticParsingApp/ProbabilisticParsingApp.java,v
      retrieving revision 1.36
      retrieving revision 1.36.4.1
      diff -C2 -d -r1.36 -r1.36.4.1
      *** ProbabilisticParsingApp.java 1 Jan 2007 23:09:11 -0000 1.36
      --- ProbabilisticParsingApp.java 17 Nov 2009 05:09:51 -0000 1.36.4.1
      ***************
      *** 19,23 ****
      * </p>
      *
      ! * <p>Copyright (c) 2005 - 2007 The MARF Research and Development Group.
      * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>
      --- 19,23 ----
      * </p>
      *
      ! * <p>Copyright (c) 2005 - 2009 The MARF Research and Development Group.
      * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>
      ***************
      *** 148,152 ****
      "Probabilistic Parsing\n" +
      "Serguei A. Mokhov, mokhov@...\n" +
      ! "April 2003 - 2007\n\n"
      );

      --- 148,152 ----
      "Probabilistic Parsing\n" +
      "Serguei A. Mokhov, mokhov@...\n" +
      ! "April 2003 - 2009\n\n"
      );


      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/ProbabilisticParsingApp/Makefile,v
      retrieving revision 1.34
      retrieving revision 1.34.4.1
      diff -C2 -d -r1.34 -r1.34.4.1
      *** Makefile 1 Jan 2007 23:09:11 -0000 1.34
      --- Makefile 17 Nov 2009 05:09:51 -0000 1.34.4.1
      ***************
      *** 4,8 ****
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 4,8 ----
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$

      Index: testing.sh
      ===================================================================
      RCS file: /cvsroot/marf/apps/ProbabilisticParsingApp/testing.sh,v
      retrieving revision 1.38
      retrieving revision 1.38.4.1
      diff -C2 -d -r1.38 -r1.38.4.1
      *** testing.sh 1 Jan 2007 23:09:11 -0000 1.38
      --- testing.sh 17 Nov 2009 05:09:51 -0000 1.38.4.1
      ***************
      *** 5,9 ****
      #
      # Copyright (C) 2003 Serguei Mokhov
      ! # Copyright (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 5,9 ----
      #
      # Copyright (C) 2003 Serguei Mokhov
      ! # Copyright (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 13
      Date: Tue, 17 Nov 2009 05:09:53 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/SpeakerIdentApp Makefile, 1.31, 1.31.4.1
      README, 1.13, 1.13.2.1 SpeakerIdentApp.java, 1.63, 1.63.4.1
      speakers.txt, 1.32, 1.32.4.1 testing.bat, 1.12, 1.12.4.1 testing.sh,
      1.42, 1.42.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKe-0007pG-0h@...>

      Update of /cvsroot/marf/apps/SpeakerIdentApp
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/SpeakerIdentApp

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile README SpeakerIdentApp.java speakers.txt testing.bat
      testing.sh
      Log Message:
      Sync core components from the HEAD.


      Index: testing.bat
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/testing.bat,v
      retrieving revision 1.12
      retrieving revision 1.12.4.1
      diff -C2 -d -r1.12 -r1.12.4.1
      *** testing.bat 1 Jan 2007 23:09:14 -0000 1.12
      --- testing.bat 17 Nov 2009 05:09:51 -0000 1.12.4.1
      ***************
      *** 4,8 ****
      :: Ported from testing.sh tcsh script.
      ::
      ! :: Copyright (C) 2003 - 2007 The MARF Research and Development Group
      ::
      :: Serguei Mokhov
      --- 4,8 ----
      :: Ported from testing.sh tcsh script.
      ::
      ! :: Copyright (C) 2003 - 2009 The MARF Research and Development Group
      ::
      :: Serguei Mokhov
      ***************
      *** 119,123 ****

      :: Classification
      ! echo for %%%%c in (-eucl -cheb -mink -mah -diff -randcl -nn) do call tmp-ident.bat %%1 %%2 %%%%c > tmp-class-ident.bat

      :: Identification
      --- 119,123 ----

      :: Classification
      ! echo for %%%%c in (-eucl -cheb -mink -mah -diff -hamming -cos -randcl -nn) do call tmp-ident.bat %%1 %%2 %%%%c > tmp-class-ident.bat

      :: Identification

      Index: speakers.txt
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/speakers.txt,v
      retrieving revision 1.32
      retrieving revision 1.32.4.1
      diff -C2 -d -r1.32 -r1.32.4.1
      *** speakers.txt 23 Dec 2006 03:05:11 -0000 1.32
      --- speakers.txt 17 Nov 2009 05:09:51 -0000 1.32.4.1
      ***************
      *** 28,29 ****
      --- 28,30 ----
      27,Shivani Bhat,shivani1.wav|shivani2.wav|shivani3.wav|shivani4.wav|shivani6.wav|shivani7.wav|shivani8.wav|shivani9.wav|shivani10.wav|shivani11.wav|shivani12.wav|shivani13.wav|shivani14.wav|shivani15.wav,shivani5.wav
      28,Marinela,BenStein.wav|DonMarquise.wav|DonaldKnuth.wav|F_P_Jones.wav|GeorgeBernardShaw.wav|H_G_Wells.wav|HectorBerloiz.wav|JihannWolfgangVonGoethe.wav|JosephWoodKrutch.wav|RichKulawiec.wav|SysadminMotto.wav|TaoTeChing.wav|ThomasEdison.wav,Voltair.wav
      + 29,Fei Fang,sentence10.wav|sentence11.wav|sentence12.wav|sentence13.wav|sentence14.wav|sentence2.wav|sentence3.wav|sentence4.wav|sentence5.wav|sentence6.wav|sentence7.wav|sentence8.wav|sentence9.wav,sentence1.wav|sentence15.wav

      Index: testing.sh
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/testing.sh,v
      retrieving revision 1.42
      retrieving revision 1.42.4.1
      diff -C2 -d -r1.42 -r1.42.4.1
      *** testing.sh 1 Jan 2007 23:09:14 -0000 1.42
      --- testing.sh 17 Nov 2009 05:09:51 -0000 1.42.4.1
      ***************
      *** 5,9 ****
      # NOTE: Make take quite some time to execute
      #
      ! # Copyright (C) 2002 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 5,9 ----
      # NOTE: Make take quite some time to execute
      #
      ! # Copyright (C) 2002 - 2009 The MARF Research and Development Group
      #
      # $Header$
      ***************
      *** 41,46 ****
      $java SpeakerIdentApp --reset

      ! foreach preprep ("" -silence)
      ! foreach prep (-norm -boost -low -high -band -highpassboost -raw -endp -lowcfe -highcfe -bandcfe -bandstopcfe)
      foreach feat (-fft -lpc -randfe -minmax -aggr)

      --- 41,46 ----
      $java SpeakerIdentApp --reset

      ! foreach preprep ("" "-silence" "-noise" "-silence -noise")
      ! foreach prep (-norm -boost -low -high -band -bandstop -highpassboost -raw -endp -lowcfe -highcfe -bandcfe -bandstopcfe)
      foreach feat (-fft -lpc -randfe -minmax -aggr)

      ***************
      *** 54,58 ****

      foreach class (-cheb -mah -randcl -nn)
      ! echo "Config: $prep $feat $class $spectrogram $graph $debug"
      date

      --- 54,58 ----

      foreach class (-cheb -mah -randcl -nn)
      ! echo "Config: $preprep $prep $feat $class $spectrogram $graph $debug"
      date

      ***************
      *** 76,85 ****
      echo "Testing..."

      ! foreach preprep ("" -silence)
      ! foreach prep (-norm -boost -low -high -band -highpassboost -raw -endp -lowcfe -highcfe -bandcfe -bandstopcfe)
      foreach feat (-fft -lpc -randfe -minmax -aggr)
      ! foreach class (-eucl -cheb -mink -mah -diff -randcl -nn)
      echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
      ! echo "Config: $prep $feat $class $spectrogram $graph $debug"
      date
      echo "============================================="
      --- 76,85 ----
      echo "Testing..."

      ! foreach preprep ("" "-silence" "-noise" "-silence -noise")
      ! foreach prep (-norm -boost -low -high -band -bandstop -highpassboost -raw -endp -lowcfe -highcfe -bandcfe -bandstopcfe)
      foreach feat (-fft -lpc -randfe -minmax -aggr)
      ! foreach class (-eucl -cheb -mink -mah -diff -hamming -cos -randcl -nn)
      echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
      ! echo "Config: $preprep $prep $feat $class $spectrogram $graph $debug"
      date
      echo "============================================="

      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/Makefile,v
      retrieving revision 1.31
      retrieving revision 1.31.4.1
      diff -C2 -d -r1.31 -r1.31.4.1
      *** Makefile 19 Feb 2007 03:25:09 -0000 1.31
      --- Makefile 17 Nov 2009 05:09:51 -0000 1.31.4.1
      ***************
      *** 4,8 ****
      # Serguei Mokhov
      #
      ! # COPYRIGHT (c) 2002 - 2007 The MARF Research Development Group
      #
      # $Header$
      --- 4,8 ----
      # Serguei Mokhov
      #
      ! # COPYRIGHT (c) 2002 - 2009 The MARF Research Development Group
      #
      # $Header$

      Index: README
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/README,v
      retrieving revision 1.13
      retrieving revision 1.13.2.1
      diff -C2 -d -r1.13 -r1.13.2.1
      *** README 20 Feb 2007 19:34:25 -0000 1.13
      --- README 17 Nov 2009 05:09:51 -0000 1.13.2.1
      ***************
      *** 7,11 ****
      $Header$

      ! Copyright (C) 2002 - 2007 The MARF Research and Development Group

      <http://marf.sf.net>
      --- 7,11 ----
      $Header$

      ! Copyright (C) 2002 - 2009 The MARF Research and Development Group

      <http://marf.sf.net>

      Index: SpeakerIdentApp.java
      ===================================================================
      RCS file: /cvsroot/marf/apps/SpeakerIdentApp/SpeakerIdentApp.java,v
      retrieving revision 1.63
      retrieving revision 1.63.4.1
      diff -C2 -d -r1.63 -r1.63.4.1
      *** SpeakerIdentApp.java 25 Dec 2006 04:57:36 -0000 1.63
      --- SpeakerIdentApp.java 17 Nov 2009 05:09:51 -0000 1.63.4.1
      ***************
      *** 1,6 ****
      --- 1,8 ----
      import java.io.File;
      + import java.util.Calendar;
      import java.util.Date;

      import marf.MARF;
      + import marf.Classification.Distance.HammingDistance;
      import marf.Storage.ModuleParams;
      import marf.Storage.TrainingSet;
      ***************
      *** 11,15 ****

      /**
      ! * <p>Indentfies a speaker independently of text, based on the MARF framework,
      * <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>
      --- 13,17 ----

      /**
      ! * <p>Identifies a speaker independently of text, based on the MARF framework,
      * <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>
      ***************
      *** 52,55 ****
      --- 54,70 ----
      /*
      * ----------------------------------
      + * Defaults
      + * ----------------------------------
      + */
      +
      + /**
      + * Default file name extension for sample files; case-insensitive.
      + * @since 0.3.0.6
      + */
      + public static final String DEFAULT_SAMPLE_FILE_EXTENSION = "wav";
      + //public static final String DEFAULT_SAMPLE_FILE_EXTENSION = "txt";
      +
      + /*
      + * ----------------------------------
      * Major and Misc Options Enumeration
      * ----------------------------------
      ***************
      *** 172,182 ****

      /**
      ! * Instance of the database of speakers.
      * @since 0.3.0.5
      */
      ! protected static SpeakersIdentDb soDB = new SpeakersIdentDb("speakers.txt");

      /**
      ! * Intance of the option processing utility.
      * @since 0.3.0.5
      */
      --- 187,208 ----

      /**
      ! * Instance of the database of speakers to track stats per
      ! * configuration for all speakers.
      * @since 0.3.0.5
      */
      ! protected static SpeakersIdentDb soDBPerConfig = new SpeakersIdentDb("speakers.txt");

      /**
      ! * Instance of the database of speakers to track stats per
      ! * speaker for all configuration.
      ! * @since 0.3.0.6
      ! */
      ! protected static SpeakersIdentDb soDBPerSpeaker = new SpeakersIdentDb("speakers.txt");
      !
      ! // protected static SpeakersIdentDb soDBPerConfig = new SpeakersIdentDb("languages.txt");
      ! // protected static SpeakersIdentDb soDBPerSpeaker = new SpeakersIdentDb("languages.txt");
      !
      ! /**
      ! * Instance of the option processing utility.
      * @since 0.3.0.5
      */
      ***************
      *** 204,207 ****
      --- 230,237 ----
      soGetOpt.addValidOption(OPT_GUI, "--gui");

      + // Sample Loading
      + soGetOpt.addValidOption(MARF.WAV, "-wav");
      + soGetOpt.addValidOption(MARF.TEXT, "-text");
      +
      // Preprocessing
      soGetOpt.addValidOption(OPT_NOISE_REMOVAL, "-noise");
      ***************
      *** 213,216 ****
      --- 243,247 ----
      soGetOpt.addValidOption(MARF.LOW_PASS_FFT_FILTER, "-low");
      soGetOpt.addValidOption(MARF.BANDPASS_FFT_FILTER, "-band");
      + soGetOpt.addValidOption(MARF.BAND_STOP_FFT_FILTER, "-bandstop");
      soGetOpt.addValidOption(MARF.HIGH_PASS_BOOST_FILTER, "-highpassboost");
      soGetOpt.addValidOption(MARF.RAW, "-raw");
      ***************
      *** 239,243 ****
      --- 270,277 ----
      soGetOpt.addValidOption(MARF.RANDOM_CLASSIFICATION, "-randcl");
      soGetOpt.addValidOption(MARF.DIFF_DISTANCE, "-diff");
      + soGetOpt.addValidOption(MARF.ZIPFS_LAW, "-zipf");
      soGetOpt.addValidOption(MARF.MARKOV, "-markov");
      + soGetOpt.addValidOption(MARF.HAMMING_DISTANCE, "-hamming");
      + soGetOpt.addValidOption(MARF.COSINE_SIMILARITY_MEASURE, "-cos");

      // Misc
      ***************
      *** 262,267 ****
      * Load the speakers database
      */
      ! soDB.connect();
      ! soDB.query();

      setDefaultConfig();
      --- 296,307 ----
      * Load the speakers database
      */
      ! soDBPerConfig.connect();
      ! soDBPerConfig.query();
      !
      ! soDBPerSpeaker.connect();
      ! soDBPerSpeaker.query();
      !
      ! soDBPerConfig.setFilename("config." + soDBPerConfig.getFilename());
      ! soDBPerSpeaker.setFilename("speaker." + soDBPerSpeaker.getFilename());

      setDefaultConfig();
      ***************
      *** 310,314 ****

      /*
      ! * May happend when trying to get expected ID,
      * but the argument doesn't parse as an int.
      */
      --- 350,354 ----

      /*
      ! * May happened when trying to get expected ID,
      * but the argument doesn't parse as an int.
      */
      ***************
      *** 379,389 ****

      // Dir contents
      ! File[] aoWaveFiles = new File(soGetOpt.getOption(OPT_DIR_OR_FILE)).listFiles();

      ! for(int i = 0; i < aoWaveFiles.length; i++)
      {
      ! String strFileName = aoWaveFiles[i].getPath();

      ! if(aoWaveFiles[i].isFile() && strFileName.toLowerCase().endsWith(".wav"))
      {
      ident(strConfig, strFileName, iExpectedID);
      --- 419,429 ----

      // Dir contents
      ! File[] aoSampleFiles = new File(soGetOpt.getOption(OPT_DIR_OR_FILE)).listFiles();

      ! for(int i = 0; i < aoSampleFiles.length; i++)
      {
      ! String strFileName = aoSampleFiles[i].getPath();

      ! if(aoSampleFiles[i].isFile() && strFileName.toLowerCase().endsWith("." + DEFAULT_SAMPLE_FILE_EXTENSION))
      {
      ident(strConfig, strFileName, iExpectedID);
      ***************
      *** 400,404 ****
      */

      ! // Add a single smaple to the training set
      case OPT_SINGLE_TRAIN:
      {
      --- 440,444 ----
      */

      ! // Add a single sample to the training set
      case OPT_SINGLE_TRAIN:
      {
      ***************
      *** 414,420 ****
      {
      // Dir contents
      ! File[] aoFiles = new File(soGetOpt.getOption(OPT_DIR_OR_FILE)).listFiles();

      ! Debug.debug("Files array: " + aoFiles);

      if(Debug.isDebugOn())
      --- 454,460 ----
      {
      // Dir contents
      ! File[] aoSampleFiles = new File(soGetOpt.getOption(OPT_DIR_OR_FILE)).listFiles();

      ! Debug.debug("Files array: " + aoSampleFiles);

      if(Debug.isDebugOn())
      ***************
      *** 426,434 ****

      // XXX: this loop has to be in MARF
      ! for(int i = 0; i < aoFiles.length; i++)
      {
      ! strFileName = aoFiles[i].getPath();

      ! if(aoFiles[i].isFile() && strFileName.toLowerCase().endsWith(".wav"))
      {
      train(strFileName);
      --- 466,474 ----

      // XXX: this loop has to be in MARF
      ! for(int i = 0; i < aoSampleFiles.length; i++)
      {
      ! strFileName = aoSampleFiles[i].getPath();

      ! if(aoSampleFiles[i].isFile() && strFileName.toLowerCase().endsWith("." + DEFAULT_SAMPLE_FILE_EXTENSION))
      {
      train(strFileName);
      ***************
      *** 455,460 ****
      case OPT_STATS:
      {
      ! soDB.restore();
      ! soDB.printStats();
      break;
      }
      --- 495,502 ----
      case OPT_STATS:
      {
      ! soDBPerConfig.restore();
      ! soDBPerConfig.printStats();
      ! soDBPerSpeaker.restore();
      ! soDBPerSpeaker.printStats();
      break;
      }
      ***************
      *** 465,470 ****
      case OPT_BEST_SCORE:
      {
      ! soDB.restore();
      ! soDB.printStats(true);
      break;
      }
      --- 507,514 ----
      case OPT_BEST_SCORE:
      {
      ! soDBPerConfig.restore();
      ! soDBPerConfig.printStats(true);
      ! soDBPerSpeaker.restore();
      ! soDBPerSpeaker.printStats(true);
      break;
      }
      ***************
      *** 475,479 ****
      case OPT_RESET:
      {
      ! soDB.resetStats();
      System.out.println("SpeakerIdentApp: Statistics has been reset.");
      break;
      --- 519,524 ----
      case OPT_RESET:
      {
      ! soDBPerConfig.resetStats();
      ! soDBPerSpeaker.resetStats();
      System.out.println("SpeakerIdentApp: Statistics has been reset.");
      break;
      ***************
      *** 554,558 ****
      {
      Debug.debug("Closing DB connection...");
      ! soDB.close();
      }
      catch(Exception e)
      --- 599,604 ----
      {
      Debug.debug("Closing DB connection...");
      ! soDBPerConfig.close();
      ! soDBPerSpeaker.close();
      }
      catch(Exception e)
      ***************
      *** 566,570 ****

      /**
      ! * Indetifies a speaker using MARF given configuration,
      * wave filename, and possibly expected speaker ID.
      *
      --- 612,616 ----

      /**
      ! * Identifies a speaker using MARF given configuration,
      * wave filename, and possibly expected speaker ID.
      *
      ***************
      *** 585,604 ****
      if(piExpectedID < 0)
      {
      ! piExpectedID = soDB.getIDByFilename(pstrFilename, false);
      }

      ! MARF.setSampleFile(pstrFilename);
      ! MARF.recognize();
      !
      ! // First guess
      ! int iIdentifiedID = MARF.queryResultID();

      // Second best
      ! int iSecondClosestID = MARF.getResultSet().getSecondClosestID();

      System.out.println(" File: " + pstrFilename);
      System.out.println(" Config: " + pstrConfig);
      System.out.println(" Speaker's ID: " + iIdentifiedID);
      ! System.out.println(" Speaker identified: " + soDB.getName(iIdentifiedID));

      /*
      --- 631,691 ----
      if(piExpectedID < 0)
      {
      ! piExpectedID = soDBPerConfig.getIDByFilename(pstrFilename, false);
      }

      ! int iIdentifiedID = -1;

      // Second best
      ! int iSecondClosestID = -1;

      + long lTimeStart = System.currentTimeMillis();
      + {
      + MARF.setSampleFile(pstrFilename);
      + MARF.recognize();
      +
      + // First guess
      + iIdentifiedID = MARF.queryResultID();
      +
      + // Second best
      + iSecondClosestID = MARF.getResultSet().getSecondClosestID();
      + }
      + long lTimeFinish = System.currentTimeMillis();
      +
      + // XXX: constify
      + int iOneSecInMs = 1000;
      + int iOneMinInMs = 60 * iOneSecInMs;
      + int iOneHourInMs = 60 * iOneMinInMs;
      + int iOneDayInMs = 24 * iOneHourInMs;
      +
      + long lDuration = lTimeFinish - lTimeStart;
      +
      + long lDays = lDuration / iOneDayInMs;
      + long lModTimeLeft = lDuration % iOneDayInMs;
      +
      + long lHours = lModTimeLeft / iOneHourInMs;
      + lModTimeLeft %= iOneHourInMs;
      +
      + long lMinutes = lModTimeLeft / iOneMinInMs;
      + lModTimeLeft %= iOneMinInMs;
      +
      + long lSeconds = lModTimeLeft / iOneSecInMs;
      + lModTimeLeft %= iOneSecInMs;
      +
      + long lMilliSeconds = lModTimeLeft;
      +
      + StringBuffer oDuration = new StringBuffer()
      + .append(lDays).append("d:")
      + .append(lHours).append("h:")
      + .append(lMinutes).append("m:")
      + .append(lSeconds).append("s:")
      + .append(lMilliSeconds).append("ms:")
      + .append(lDuration).append("ms")
      + ;
      +
      System.out.println(" File: " + pstrFilename);
      System.out.println(" Config: " + pstrConfig);
      + System.out.println(" Processing time: " + oDuration);
      System.out.println(" Speaker's ID: " + iIdentifiedID);
      ! System.out.println(" Speaker identified: " + soDBPerConfig.getName(iIdentifiedID));

      /*
      ***************
      *** 608,617 ****
      {
      System.out.println("Expected Speaker's ID: " + piExpectedID);
      ! System.out.println(" Expected Speaker: " + soDB.getName(piExpectedID));

      ! soDB.restore();
      {
      // 1st match
      ! soDB.addStats(pstrConfig, (iIdentifiedID == piExpectedID));

      // 2nd best: must be true if either 1st true or second true (or both :))
      --- 695,706 ----
      {
      System.out.println("Expected Speaker's ID: " + piExpectedID);
      ! System.out.println(" Expected Speaker: " + soDBPerConfig.getName(piExpectedID));

      ! soDBPerConfig.restore();
      ! soDBPerSpeaker.restore();
      {
      // 1st match
      ! soDBPerConfig.addStats(pstrConfig, (iIdentifiedID == piExpectedID));
      ! soDBPerSpeaker.addStats(soDBPerConfig.getName(piExpectedID), (iIdentifiedID == piExpectedID));

      // 2nd best: must be true if either 1st true or second true (or both :))
      ***************
      *** 621,631 ****
      iSecondClosestID == piExpectedID;

      ! soDB.addStats(pstrConfig, bSecondBest, true);
      }
      ! soDB.dump();
      }

      System.out.println(" Second Best ID: " + iSecondClosestID);
      ! System.out.println(" Second Best Name: " + soDB.getName(iSecondClosestID));
      System.out.println(" Date/time: " + new Date());
      System.out.println("----------------------------8<------------------------------");
      --- 710,722 ----
      iSecondClosestID == piExpectedID;

      ! soDBPerConfig.addStats(pstrConfig, bSecondBest, true);
      ! soDBPerSpeaker.addStats(soDBPerConfig.getName(piExpectedID), bSecondBest, true);
      }
      ! soDBPerConfig.dump();
      ! soDBPerSpeaker.dump();
      }

      System.out.println(" Second Best ID: " + iSecondClosestID);
      ! System.out.println(" Second Best Name: " + soDBPerConfig.getName(iSecondClosestID));
      System.out.println(" Date/time: " + new Date());
      System.out.println("----------------------------8<------------------------------");
      ***************
      *** 645,649 ****
      MARF.setSampleFile(pstrFilename);

      ! int iID = soDB.getIDByFilename(pstrFilename, true);

      if(iID == -1)
      --- 736,740 ----
      MARF.setSampleFile(pstrFilename);

      ! int iID = soDBPerConfig.getIDByFilename(pstrFilename, true);

      if(iID == -1)
      ***************
      *** 671,675 ****
      " --batch-ident <samples-dir> [options] -- batch identification mode\n" +
      " --gui -- use GUI as a user interface\n" +
      ! " --stats -- display stats\n" +
      " --best-score -- display best classification result\n" +
      " --reset -- reset stats\n" +
      --- 762,766 ----
      " --batch-ident <samples-dir> [options] -- batch identification mode\n" +
      " --gui -- use GUI as a user interface\n" +
      ! " --stats=[per-config|per-speaker|both] -- display stats (default is per-config)\n" +
      " --best-score -- display best classification result\n" +
      " --reset -- reset stats\n" +
      ***************
      *** 679,685 ****
      "Options (one or more of the following):\n\n" +

      "Preprocessing:\n\n" +
      ! " -silence - remove silence (can be combined with any below)\n" +
      ! " -noise - remove noise (can be combined with any below)\n" +
      " -raw - no preprocessing\n" +
      " -norm - use just normalization, no filtering\n" +
      --- 770,781 ----
      "Options (one or more of the following):\n\n" +

      + "Loaders:\n\n" +
      + " -wav - assume WAVE files loading (default)\n" +
      + " -text - assume loading of text samples\n" +
      + "\n" +
      +
      "Preprocessing:\n\n" +
      ! " -silence - remove silence (can be combined with any of the below)\n" +
      ! " -noise - remove noise (can be combined with any of the below)\n" +
      " -raw - no preprocessing\n" +
      " -norm - use just normalization, no filtering\n" +
      ***************
      *** 688,691 ****
      --- 784,788 ----
      " -boost - use high-frequency-boost FFT preprocessor\n" +
      " -band - use band-pass FFT filter\n" +
      + " -bandstop - use band-stop FFT filter\n" +
      " -endp - use endpointing\n" +
      " -lowcfe - use low-pass CFE filter\n" +
      ***************
      *** 701,705 ****
      " -randfe - use random feature extraction\n" +
      " -aggr - use aggregated FFT+LPC feature extraction\n" +
      ! " -f0 - use F0 (pitch, or fundamental frequency; NOT IMPLEMENTED\n" +
      " -segm - use Segmentation (NOT IMPLEMENTED)\n" +
      " -cepstral - use Cepstral analysis (NOT IMPLEMENTED)\n" +
      --- 798,802 ----
      " -randfe - use random feature extraction\n" +
      " -aggr - use aggregated FFT+LPC feature extraction\n" +
      ! " -f0 - use F0 (pitch, or fundamental frequency; NOT IMPLEMENTED)\n" +
      " -segm - use Segmentation (NOT IMPLEMENTED)\n" +
      " -cepstral - use Cepstral analysis (NOT IMPLEMENTED)\n" +
      ***************
      *** 712,717 ****
      --- 809,817 ----
      " -mink - use Minkowski Distance\n" +
      " -diff - use Diff-Distance\n" +
      + " -zipf - use Zipf's Law-based classifier\n" +
      " -randcl - use random classification\n" +
      " -markov - use Hidden Markov Models (NOT IMPLEMENTED)\n" +
      + " -hamming - use Hamming Distance\n" +
      + " -cos - use Cosine Similarity Measure\n" +
      "\n" +

      ***************
      *** 796,800 ****
      /**
      * Sets default MARF configuration parameters as normalization
      ! * for preprocessing, FFT for feature extraction, Eucludean
      * distance for training and classification with no spectrogram
      * dumps and no debug information, assuming WAVE file format.
      --- 896,900 ----
      /**
      * Sets default MARF configuration parameters as normalization
      ! * for preprocessing, FFT for feature extraction, Euclidean
      * distance for training and classification with no spectrogram
      * dumps and no debug information, assuming WAVE file format.
      ***************
      *** 814,817 ****
      --- 914,918 ----
      MARF.setDumpSpectrogram(false);
      MARF.setSampleFormat(MARF.WAV);
      + // MARF.setSampleFormat(MARF.TEXT);

      Debug.enableDebug(false);
      ***************
      *** 821,825 ****
      * Customizes MARF's configuration based on the options.
      * @throws MARFException if some options are out of range
      ! * @since 0.3.0.5
      */
      public static final void setCustomConfig()
      --- 922,926 ----
      * Customizes MARF's configuration based on the options.
      * @throws MARFException if some options are out of range
      ! * @since 0.3.0.5
      */
      public static final void setCustomConfig()
      ***************
      *** 852,855 ****
      --- 953,957 ----
      case MARF.LOW_PASS_FFT_FILTER:
      case MARF.BANDPASS_FFT_FILTER:
      + case MARF.BAND_STOP_FFT_FILTER:
      case MARF.HIGH_PASS_BOOST_FILTER:
      case MARF.BAND_PASS_CFE_FILTER:
      ***************
      *** 858,865 ****
      case MARF.HIGH_PASS_CFE_FILTER:
      {
      !
      ! // Normalization and filters seem to respond better
      ! // to silence removal. Setting noise removal at this
      ! // time has no effect. The setting of the third protocol parameter
      // is yet to be implemented here.
      oParams.addPreprocessingParam(new Boolean(soGetOpt.isActiveOption(OPT_NOISE_REMOVAL)));
      --- 960,965 ----
      case MARF.HIGH_PASS_CFE_FILTER:
      {
      ! // Normalization and filters seem to respond better to silence removal.
      ! // The setting of the third protocol parameter (silence threshold)
      // is yet to be implemented here.
      oParams.addPreprocessingParam(new Boolean(soGetOpt.isActiveOption(OPT_NOISE_REMOVAL)));
      ***************
      *** 869,873 ****
      --- 969,975 ----

      default:
      + {
      assert false : "Not implemented valid preprocessing configuration parameter: " + iPreprocessingMethod;
      + }
      } // switch

      ***************
      *** 949,952 ****
      --- 1051,1065 ----
      }

      + case MARF.HAMMING_DISTANCE:
      + {
      + // Dump/Restore Format
      + oParams.addClassificationParam(new Integer(TrainingSet.DUMP_GZIP_BINARY));
      +
      + // Type of hamming comparison
      + oParams.addClassificationParam(new Integer(HammingDistance.STRICT_DOUBLE));
      +
      + break;
      + }
      +
      case MARF.MINKOWSKI_DISTANCE:
      {
      ***************
      *** 966,969 ****
      --- 1079,1084 ----
      case MARF.DIFF_DISTANCE:
      case MARF.MARKOV:
      + case MARF.ZIPFS_LAW:
      + case MARF.COSINE_SIMILARITY_MEASURE:
      // For now do nothing; customize when these methods
      // become parametrizable.
      ***************
      *** 971,975 ****

      default:
      ! assert false;
      } // switch

      --- 1086,1090 ----

      default:
      ! assert false : "Unrecognized classification module";
      } // switch





      ------------------------------

      Message: 14
      Date: Tue, 17 Nov 2009 05:09:54 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/TestNN Makefile,1.13,1.13.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKe-0007pU-Bn@...>

      Update of /cvsroot/marf/apps/TestNN
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/TestNN

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile
      Log Message:
      Sync core components from the HEAD.


      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/TestNN/Makefile,v
      retrieving revision 1.13
      retrieving revision 1.13.4.1
      diff -C2 -d -r1.13 -r1.13.4.1
      *** Makefile 1 Jan 2007 23:09:15 -0000 1.13
      --- Makefile 17 Nov 2009 05:09:52 -0000 1.13.4.1
      ***************
      *** 4,8 ****
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 4,8 ----
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 15
      Date: Tue, 17 Nov 2009 05:09:54 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/TestLPC Makefile,1.15,1.15.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKe-0007pM-5Z@...>

      Update of /cvsroot/marf/apps/TestLPC
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/TestLPC

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile
      Log Message:
      Sync core components from the HEAD.


      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/TestLPC/Makefile,v
      retrieving revision 1.15
      retrieving revision 1.15.4.1
      diff -C2 -d -r1.15 -r1.15.4.1
      *** Makefile 1 Jan 2007 23:09:14 -0000 1.15
      --- Makefile 17 Nov 2009 05:09:52 -0000 1.15.4.1
      ***************
      *** 2,6 ****
      # Serguei Mokhov
      #
      ! # (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 2,6 ----
      # Serguei Mokhov
      #
      ! # (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 16
      Date: Tue, 17 Nov 2009 05:09:54 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/ZipfLawApp Makefile, 1.25, 1.25.4.1
      ZipfLaw.java, 1.28, 1.28.4.1 testing.sh, 1.11, 1.11.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKe-0007pc-JF@...>

      Update of /cvsroot/marf/apps/ZipfLawApp
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/ZipfLawApp

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile ZipfLaw.java testing.sh
      Log Message:
      Sync core components from the HEAD.


      Index: ZipfLaw.java
      ===================================================================
      RCS file: /cvsroot/marf/apps/ZipfLawApp/ZipfLaw.java,v
      retrieving revision 1.28
      retrieving revision 1.28.4.1
      diff -C2 -d -r1.28 -r1.28.4.1
      *** ZipfLaw.java 1 Jan 2007 23:09:15 -0000 1.28
      --- ZipfLaw.java 17 Nov 2009 05:09:52 -0000 1.28.4.1
      ***************
      *** 15,19 ****
      * </p>
      *
      ! * <p>Copyright (c) 2005 - 2007 The MARF Research and Development Group.
      * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>
      --- 15,19 ----
      * </p>
      *
      ! * <p>Copyright (c) 2005 - 2009 The MARF Research and Development Group.
      * For more details, please consult <a href="http://marf.sf.net">http://marf.sf.net</a>.
      * </p>

      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/ZipfLawApp/Makefile,v
      retrieving revision 1.25
      retrieving revision 1.25.4.1
      diff -C2 -d -r1.25 -r1.25.4.1
      *** Makefile 1 Jan 2007 23:09:15 -0000 1.25
      --- Makefile 17 Nov 2009 05:09:52 -0000 1.25.4.1
      ***************
      *** 4,8 ****
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 4,8 ----
      # Serguei A. Mokhov, mokhov@...
      #
      ! # (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$

      Index: testing.sh
      ===================================================================
      RCS file: /cvsroot/marf/apps/ZipfLawApp/testing.sh,v
      retrieving revision 1.11
      retrieving revision 1.11.4.1
      diff -C2 -d -r1.11 -r1.11.4.1
      *** testing.sh 1 Jan 2007 23:09:15 -0000 1.11
      --- testing.sh 17 Nov 2009 05:09:52 -0000 1.11.4.1
      ***************
      *** 5,9 ****
      #
      # Copyright (C) 2003 Serguei Mokhov
      ! # Copyright (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 5,9 ----
      #
      # Copyright (C) 2003 Serguei Mokhov
      ! # Copyright (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 17
      Date: Tue, 17 Nov 2009 05:09:53 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps Makefile,1.19,1.19.4.1 README,1.6,1.6.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKd-0007p6-5E@...>

      Update of /cvsroot/marf/apps
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile README
      Log Message:
      Sync core components from the HEAD.


      Index: README
      ===================================================================
      RCS file: /cvsroot/marf/apps/README,v
      retrieving revision 1.6
      retrieving revision 1.6.4.1
      diff -C2 -d -r1.6 -r1.6.4.1
      *** README 1 Jan 2007 23:09:11 -0000 1.6
      --- README 17 Nov 2009 05:09:51 -0000 1.6.4.1
      ***************
      *** 1,5 ****
      Applications README

      ! (C) 2002 - 2007 The MARF Research and Development Group

      $Header$
      --- 1,5 ----
      Applications README

      ! (C) 2002 - 2009 The MARF Research and Development Group

      $Header$

      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/Makefile,v
      retrieving revision 1.19
      retrieving revision 1.19.4.1
      diff -C2 -d -r1.19 -r1.19.4.1
      *** Makefile 1 Jan 2007 23:09:11 -0000 1.19
      --- Makefile 17 Nov 2009 05:09:51 -0000 1.19.4.1
      ***************
      *** 3,7 ****
      # Serguei Mokhov
      #
      ! # (C) 2003 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 3,7 ----
      # Serguei Mokhov
      #
      ! # (C) 2003 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 18
      Date: Tue, 17 Nov 2009 05:09:53 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/Regression Makefile,1.11,1.11.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKd-0007pD-Ut@...>

      Update of /cvsroot/marf/apps/Regression
      In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29728/apps/Regression

      Modified Files:
      Tag: DISTRIBUTED_MARF_0_3_0_INTEGRATION
      Makefile
      Log Message:
      Sync core components from the HEAD.


      Index: Makefile
      ===================================================================
      RCS file: /cvsroot/marf/apps/Regression/Makefile,v
      retrieving revision 1.11
      retrieving revision 1.11.4.1
      diff -C2 -d -r1.11 -r1.11.4.1
      *** Makefile 1 Jan 2007 23:09:13 -0000 1.11
      --- Makefile 17 Nov 2009 05:09:51 -0000 1.11.4.1
      ***************
      *** 2,6 ****
      # Serguei Mokhov
      #
      ! # (C) 2005 - 2007 The MARF Research and Development Group
      #
      # $Header$
      --- 2,6 ----
      # Serguei Mokhov
      #
      ! # (C) 2005 - 2009 The MARF Research and Development Group
      #
      # $Header$




      ------------------------------

      Message: 19
      Date: Tue, 17 Nov 2009 05:09:54 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] apps/TestMath Makefile, 1.14, 1.14.4.1
      MathTestApp.java, 1.21, 1.21.4.1
      To: marf-cvs@...
      Message-ID: <E1NAGKe-0007pS-AX@...>

      Update of /cvsroot/marf/apps/TestMath
      In directory 23jx<br/><br/>(Message over 64 KB, truncated)
    Your message has been successfully submitted and would be delivered to recipients shortly.