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

269marf-cvs Digest, Vol 25, Issue 1

Expand Messages
  • marf-cvs-bounces@lists.sourceforge.net
    Jul 8, 2012
    • 0 Attachment
      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 40k
      ----------------------------------------------

      Today's Topics:

      1. marf/src/marf MARF.java,1.117,1.118 (Serguei A. Mokhov)
      2. marf/src/marf MARF.java,1.118,1.119 (Serguei A. Mokhov)
      3. marf/src/marf/math Algorithms.java,1.18,1.19 (Serguei A. Mokhov)
      4. marf/src/marf/Storage ByteArrayFileReader.java,1.6,1.7
      (Serguei A. Mokhov)
      5. marf/src/marf/Classification/NeuralNetwork
      NeuralNetwork.java, 1.63, 1.64 (Serguei A. Mokhov)
      6. marf/src/marf/FeatureExtraction/LPC LPC.java,1.41,1.42
      (Serguei A. Mokhov)
      7. marf/src/marf/Classification/Stochastic ZipfLaw.java, 1.34,
      1.35 (Serguei A. Mokhov)
      8. marf/src/marf Configuration.java,1.6,1.7 (Serguei A. Mokhov)
      9. marf/src/marf/Classification/Distance HammingDistance.java,
      1.2, 1.3 MinkowskiDistance.java, 1.12, 1.13 (Serguei A. Mokhov)
      10. marf/src/marf/FeatureExtraction/RawFeatureExtraction
      RawFeatureExtraction.java, 1.2, 1.3 (Serguei A. Mokhov)
      11. marf/src/marf/Classification/RandomClassification
      RandomClassification.java, 1.21, 1.22 (Serguei A. Mokhov)


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

      Message: 1
      Date: Sun, 17 Jun 2012 19:12:31 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf MARF.java,1.117,1.118
      To: marf-cvs@...
      Message-ID:
      <mailman.52581.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf
      In directory vz-cvs-4.sog:/tmp/cvs-serv20358/marf/src/marf

      Modified Files:
      MARF.java
      Log Message:
      Parametrize Class code. Add getClassificationClassByID() to be able
      to get a Class from the numerical classifier ID.


      Index: MARF.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/MARF.java,v
      retrieving revision 1.117
      retrieving revision 1.118
      diff -C2 -d -r1.117 -r1.118
      *** MARF.java 27 Nov 2011 15:17:07 -0000 1.117
      --- MARF.java 17 Jun 2012 19:12:28 -0000 1.118
      ***************
      *** 650,654 ****
      * @since 0.3.0.5
      */
      ! private static Class soSampleLoaderPluginClass = null;

      /**
      --- 650,654 ----
      * @since 0.3.0.5
      */
      ! private static Class<?> soSampleLoaderPluginClass = null;

      /**
      ***************
      *** 656,660 ****
      * @since 0.3.0.4
      */
      ! private static Class soPreprocessingPluginClass = null;

      /**
      --- 656,660 ----
      * @since 0.3.0.4
      */
      ! private static Class<?> soPreprocessingPluginClass = null;

      /**
      ***************
      *** 662,666 ****
      * @since 0.3.0.4
      */
      ! private static Class soFeatureExtractionPluginClass = null;

      /**
      --- 662,666 ----
      * @since 0.3.0.4
      */
      ! private static Class<?> soFeatureExtractionPluginClass = null;

      /**
      ***************
      *** 668,672 ****
      * @since 0.3.0.4
      */
      ! private static Class soClassificationPluginClass = null;


      --- 668,672 ----
      * @since 0.3.0.4
      */
      ! private static Class<?> soClassificationPluginClass = null;


      ***************
      *** 1034,1038 ****
      * @since 0.3.0.5
      */
      ! public static synchronized final void setSampleLoaderPluginClass(Class poClass)
      throws MARFException
      {
      --- 1034,1038 ----
      * @since 0.3.0.5
      */
      ! public static synchronized final void setSampleLoaderPluginClass(Class<?> poClass)
      throws MARFException
      {
      ***************
      *** 1050,1054 ****
      * @since 0.3.0.5
      */
      ! public static synchronized final Class getSampleLoaderPluginClass()
      {
      return soSampleLoaderPluginClass;
      --- 1050,1054 ----
      * @since 0.3.0.5
      */
      ! public static synchronized final Class<?> getSampleLoaderPluginClass()
      {
      return soSampleLoaderPluginClass;
      ***************
      *** 1080,1084 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final void setPreprocessingPluginClass(Class poClass)
      throws MARFException
      {
      --- 1080,1084 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final void setPreprocessingPluginClass(Class<?> poClass)
      throws MARFException
      {
      ***************
      *** 1096,1100 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final Class getPreprocessingPluginClass()
      {
      return soPreprocessingPluginClass;
      --- 1096,1100 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final Class<?> getPreprocessingPluginClass()
      {
      return soPreprocessingPluginClass;
      ***************
      *** 1126,1130 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final void setFeatureExtractionPluginClass(Class poClass)
      throws MARFException
      {
      --- 1126,1130 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final void setFeatureExtractionPluginClass(Class<?> poClass)
      throws MARFException
      {
      ***************
      *** 1142,1146 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final Class getFeatureExtractionPluginClass()
      {
      return soFeatureExtractionPluginClass;
      --- 1142,1146 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final Class<?> getFeatureExtractionPluginClass()
      {
      return soFeatureExtractionPluginClass;
      ***************
      *** 1172,1176 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final void setClassificationPluginClass(Class poClass)
      throws MARFException
      {
      --- 1172,1176 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final void setClassificationPluginClass(Class<?> poClass)
      throws MARFException
      {
      ***************
      *** 1188,1192 ****
      * @since 0.3.0.4
      */
      ! public static synchronized final Class getClassificationPluginClass()
      {
      return soClassificationPluginClass;
      --- 1188,1192 ----
      * @since 0.3.0.4
      */
      ! public static synchronized final Class<?> getClassificationPluginClass()
      {
      return soClassificationPluginClass;
      ***************
      *** 1472,1475 ****
      --- 1472,1479 ----
      }

      + /**
      + * @param poSample
      + * @throws MARFException
      + */
      private static final void startRecognitionPipeline(Sample poSample)
      throws MARFException
      ***************
      *** 1477,1548 ****
      soSample = poSample;

      ! /*
      ! * Preprocessing Stage
      ! */
      ! synchronized(soSample)
      ! {
      ! Debug.debug("MARF: Preprocessing...");
      ! soPreprocessing = PreprocessingFactory.create(siPreprocessingMethod, soSample);

      ! synchronized(soPreprocessing)
      ! {
      ! // TODO: [SM]: Should this be in the preprocessing itself somewhere?

      ! if(sbDumpWaveGraph)
      ! {
      ! Debug.debug("MARF: Dumping initial wave graph...");

      ! new WaveGrapher
      ! (
      ! soSample.getSampleArray(),
      ! 0,
      ! soSample.getSampleArray().length,
      ! getSampleFile(),
      ! "initial"
      ! ).dump();
      ! }

      ! Debug.debug("MARF: Invoking preprocess() of " + soPreprocessing.getClass().getName());
      ! soPreprocessing.preprocess();
      ! Debug.debug("MARF: Done preprocess() of " + soPreprocessing.getClass().getName());

      ! if(sbDumpWaveGraph)
      ! {
      ! Debug.debug("MARF: Dumping preprocessed wave graph...");

      ! new WaveGrapher
      ! (
      ! soSample.getSampleArray(),
      ! 0,
      ! soSample.getSampleArray().length,
      ! getSampleFile(),
      ! "preprocessed"
      ! ).dump();
      ! }

      ! /*
      ! * Feature Extraction Stage
      ! */
      ! Debug.debug("MARF: Feature extraction...");
      ! soFeatureExtraction = FeatureExtractionFactory.create(siFeatureExtractionMethod, soPreprocessing);

      ! synchronized(soFeatureExtraction)
      ! {
      ! soFeatureExtraction.extractFeatures();

      ! /*
      ! * Classification Stage
      ! */
      ! Debug.debug("MARF: Classification...");
      ! soClassification = ClassificationFactory.create(siClassificationMethod, soFeatureExtraction);

      ! /*
      ! * Classification ends in here, as it is continue in one
      ! * way or the other in train() or recognize() depending on
      ! * the current run-time mode.
      ! */
      ! }// feat
      ! }// prep
      ! }//sample itself
      }

      --- 1481,1552 ----
      soSample = poSample;

      ! /*
      ! * Preprocessing Stage
      ! */
      ! synchronized(soSample)
      ! {
      ! Debug.debug("MARF: Preprocessing...");
      ! soPreprocessing = PreprocessingFactory.create(siPreprocessingMethod, soSample);

      ! synchronized(soPreprocessing)
      ! {
      ! // TODO: [SM]: Should this be in the preprocessing itself somewhere?

      ! if(sbDumpWaveGraph)
      ! {
      ! Debug.debug("MARF: Dumping initial wave graph...");

      ! new WaveGrapher
      ! (
      ! soSample.getSampleArray(),
      ! 0,
      ! soSample.getSampleArray().length,
      ! getSampleFile(),
      ! "initial"
      ! ).dump();
      ! }

      ! Debug.debug("MARF: Invoking preprocess() of " + soPreprocessing.getClass().getName());
      ! soPreprocessing.preprocess();
      ! Debug.debug("MARF: Done preprocess() of " + soPreprocessing.getClass().getName());

      ! if(sbDumpWaveGraph)
      ! {
      ! Debug.debug("MARF: Dumping preprocessed wave graph...");

      ! new WaveGrapher
      ! (
      ! soSample.getSampleArray(),
      ! 0,
      ! soSample.getSampleArray().length,
      ! getSampleFile(),
      ! "preprocessed"
      ! ).dump();
      ! }

      ! /*
      ! * Feature Extraction Stage
      ! */
      ! Debug.debug("MARF: Feature extraction...");
      ! soFeatureExtraction = FeatureExtractionFactory.create(siFeatureExtractionMethod, soPreprocessing);

      ! synchronized(soFeatureExtraction)
      ! {
      ! soFeatureExtraction.extractFeatures();

      ! /*
      ! * Classification Stage
      ! */
      ! Debug.debug("MARF: Classification...");
      ! soClassification = ClassificationFactory.create(siClassificationMethod, soFeatureExtraction);

      ! /*
      ! * Classification ends in here, as it is continue in one
      ! * way or the other in train() or recognize() depending on
      ! * the current run-time mode.
      ! */
      ! }// feat
      ! }// prep
      ! }//sample itself
      }





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

      Message: 2
      Date: Sun, 17 Jun 2012 22:32:43 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf MARF.java,1.118,1.119
      To: marf-cvs@...
      Message-ID:
      <mailman.52582.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf
      In directory vz-cvs-4.sog:/tmp/cvs-serv5548/marf

      Modified Files:
      MARF.java
      Log Message:
      Add the getClassificationClass() API based on the integer method than
      instantiation. Used in MARFCAT with DGT.


      Index: MARF.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/MARF.java,v
      retrieving revision 1.118
      retrieving revision 1.119
      diff -C2 -d -r1.118 -r1.119
      *** MARF.java 17 Jun 2012 19:12:28 -0000 1.118
      --- MARF.java 17 Jun 2012 22:32:41 -0000 1.119
      ***************
      *** 1310,1313 ****
      --- 1310,1324 ----

      /**
      + * Retrieves current <code>Classification</code> reference.
      + * @return Classification object
      + * @since 0.3.0.6; June 17, 2012
      + */
      + public static synchronized final Class<?> getClassificationClass()
      + throws ClassificationException
      + {
      + return ClassificationFactory.getClassificationClassByID(siClassificationMethod);
      + }
      +
      + /**
      * Queries for the final classification result.
      * @return integer ID of the identified subject




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

      Message: 3
      Date: Sun, 17 Jun 2012 22:33:36 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/math Algorithms.java,1.18,1.19
      To: marf-cvs@...
      Message-ID:
      <mailman.52583.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/math
      In directory vz-cvs-4.sog:/tmp/cvs-serv5632/marf/math

      Modified Files:
      Algorithms.java
      Log Message:
      Silence some debug versbosity.


      Index: Algorithms.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/math/Algorithms.java,v
      retrieving revision 1.18
      retrieving revision 1.19
      diff -C2 -d -r1.18 -r1.19
      *** Algorithms.java 8 Jun 2012 20:55:28 -0000 1.18
      --- Algorithms.java 17 Jun 2012 22:33:34 -0000 1.19
      ***************
      *** 576,580 ****
      public static final double[] add(double[] x, double[] y)
      {
      ! System.err.println("x.l"+x.length+",y.l="+y.length);

      //double[] z = new double[x.length];
      --- 576,580 ----
      public static final double[] add(double[] x, double[] y)
      {
      ! //System.err.println("x.l"+x.length+",y.l="+y.length);

      //double[] z = new double[x.length];
      ***************
      *** 786,790 ****
      {
      //acc += *statePtr++ * *h++;
      ! System.err.println("statePtr="+statePtr+",h="+h+",_state.l="+_state.length+",in.l="+in.length);
      // XXX: Kludge and hack
      /*
      --- 786,790 ----
      {
      //acc += *statePtr++ * *h++;
      ! //System.err.println("statePtr="+statePtr+",h="+h+",_state.l="+_state.length+",in.l="+in.length);
      // XXX: Kludge and hack
      /*
      ***************
      *** 846,850 ****
      // just copy last input samples into state buffer
      //copy(end - (_coefsPerPhase - 1), end, _state);
      ! System.err.println("_state.l="+_state.length+",_coefsPerPhase="+_coefsPerPhase+",end="+end+",in.l="+in.length);
      //Arrays.copy(_state, end - (_coefsPerPhase - 1), in, end);
      Arrays.copy(_state, 0, in, end - (_coefsPerPhase - 1), (_coefsPerPhase - 1));
      --- 846,850 ----
      // just copy last input samples into state buffer
      //copy(end - (_coefsPerPhase - 1), end, _state);
      ! //System.err.println("_state.l="+_state.length+",_coefsPerPhase="+_coefsPerPhase+",end="+end+",in.l="+in.length);
      //Arrays.copy(_state, end - (_coefsPerPhase - 1), in, end);
      Arrays.copy(_state, 0, in, end - (_coefsPerPhase - 1), (_coefsPerPhase - 1));




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

      Message: 4
      Date: Mon, 09 Jul 2012 03:27:32 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Storage
      ByteArrayFileReader.java,1.6,1.7
      To: marf-cvs@...
      Message-ID:
      <mailman.52584.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/Storage
      In directory vz-cvs-4.sog:/tmp/cvs-serv28035/marf/Storage

      Modified Files:
      ByteArrayFileReader.java
      Log Message:
      Make minor cosmetic update in the javadoc comments.


      Index: ByteArrayFileReader.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Storage/ByteArrayFileReader.java,v
      retrieving revision 1.6
      retrieving revision 1.7
      diff -C2 -d -r1.6 -r1.7
      *** ByteArrayFileReader.java 22 Feb 2009 02:16:01 -0000 1.6
      --- ByteArrayFileReader.java 9 Jul 2012 03:27:29 -0000 1.7
      ***************
      *** 18,25 ****
      * <p>Reads in a file contents into a byte array buffers.</p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      ! * @version $Revision$
      * @since 0.3.0.6
      */
      --- 18,23 ----
      * <p>Reads in a file contents into a byte array buffers.</p>
      *
      * @author Serguei Mokhov
      ! * @version $Id$
      * @since 0.3.0.6
      */




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

      Message: 5
      Date: Mon, 09 Jul 2012 03:53:34 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Classification/NeuralNetwork
      NeuralNetwork.java, 1.63, 1.64
      To: marf-cvs@...
      Message-ID:
      <mailman.52585.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/Classification/NeuralNetwork
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/Classification/NeuralNetwork

      Modified Files:
      NeuralNetwork.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: NeuralNetwork.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Classification/NeuralNetwork/NeuralNetwork.java,v
      retrieving revision 1.63
      retrieving revision 1.64
      diff -C2 -d -r1.63 -r1.64
      *** NeuralNetwork.java 27 May 2010 20:55:42 -0000 1.63
      --- NeuralNetwork.java 9 Jul 2012 03:53:32 -0000 1.64
      ***************
      *** 36,45 ****
      * <p>Artificial Neural Network-based Classifier.</p>
      *
      - * $Id$
      - *
      * @author Ian Clement
      * @author Serguei Mokhov
      *
      ! * @version $Revision$
      * @since 0.0.1
      */
      --- 36,43 ----
      * <p>Artificial Neural Network-based Classifier.</p>
      *
      * @author Ian Clement
      * @author Serguei Mokhov
      *
      ! * @version $Id$
      * @since 0.0.1
      */
      ***************
      *** 1176,1180 ****
      }

      ! Vector oNeuralNetLayersData = new Vector(3);
      oNeuralNetLayersData.add(this.oInputs);
      oNeuralNetLayersData.add(this.oLayers);
      --- 1174,1178 ----
      }

      ! Vector<Serializable> oNeuralNetLayersData = new Vector<Serializable>(3);
      oNeuralNetLayersData.add(this.oInputs);
      oNeuralNetLayersData.add(this.oLayers);
      ***************
      *** 1260,1263 ****
      --- 1258,1262 ----
      * @since 0.3.0.6
      */
      + @SuppressWarnings("unchecked")
      public void backSynchronizeObject()
      {




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

      Message: 6
      Date: Mon, 09 Jul 2012 03:53:35 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/FeatureExtraction/LPC
      LPC.java,1.41,1.42
      To: marf-cvs@...
      Message-ID:
      <mailman.52586.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/FeatureExtraction/LPC
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/FeatureExtraction/LPC

      Modified Files:
      LPC.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: LPC.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/FeatureExtraction/LPC/LPC.java,v
      retrieving revision 1.41
      retrieving revision 1.42
      diff -C2 -d -r1.41 -r1.42
      *** LPC.java 4 Aug 2006 03:31:05 -0000 1.41
      --- LPC.java 9 Jul 2012 03:53:33 -0000 1.42
      ***************
      *** 1,4 ****
      --- 1,5 ----
      package marf.FeatureExtraction.LPC;

      + import java.io.Serializable;
      import java.util.Vector;

      ***************
      *** 16,25 ****
      * <p>Class LPC implements Linear Predictive Coding.</p>
      *
      - * $Id$
      - *
      * @author Ian Clement
      * @author Serguei Mokhov
      *
      ! * @version $Revision$
      * @since 0.0.1
      */
      --- 17,24 ----
      * <p>Class LPC implements Linear Predictive Coding.</p>
      *
      * @author Ian Clement
      * @author Serguei Mokhov
      *
      ! * @version $Id$
      * @since 0.0.1
      */
      ***************
      *** 74,78 ****
      if(oModuleParams != null)
      {
      ! Vector oParams = oModuleParams.getFeatureExtractionParams();

      if(oParams.size() > 0)
      --- 73,77 ----
      if(oModuleParams != null)
      {
      ! Vector<Serializable> oParams = oModuleParams.getFeatureExtractionParams();

      if(oParams.size() > 0)




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

      Message: 7
      Date: Mon, 09 Jul 2012 03:53:35 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Classification/Stochastic
      ZipfLaw.java, 1.34, 1.35
      To: marf-cvs@...
      Message-ID:
      <mailman.52587.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/Classification/Stochastic
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/Classification/Stochastic

      Modified Files:
      ZipfLaw.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: ZipfLaw.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Classification/Stochastic/ZipfLaw.java,v
      retrieving revision 1.34
      retrieving revision 1.35
      diff -C2 -d -r1.34 -r1.35
      *** ZipfLaw.java 23 Jun 2010 09:40:18 -0000 1.34
      --- ZipfLaw.java 9 Jul 2012 03:53:32 -0000 1.35
      ***************
      *** 21,28 ****
      * <p>Module exercising Zipf's Law.</p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      ! * @version $Revision$
      * @since 0.3.0.2
      */
      --- 21,26 ----
      * <p>Module exercising Zipf's Law.</p>
      *
      * @author Serguei Mokhov
      ! * @version $Id$
      * @since 0.3.0.2
      */
      ***************
      *** 331,336 ****
      private void sort()
      {
      ! // this.aoSortedStatRefs = (WordStats[])oStats.values().toArray(new WordStats[0]);
      ! this.aoSortedStatRefs = (StatisticalObject[])this.oStats.values().toArray(new StatisticalObject[0]);
      marf.util.Arrays.sort(this.aoSortedStatRefs, new FrequencyComparator(SortComparator.DESCENDING));
      }
      --- 329,333 ----
      private void sort()
      {
      ! this.aoSortedStatRefs = this.oStats.values().toArray(new StatisticalObject[0]);
      marf.util.Arrays.sort(this.aoSortedStatRefs, new FrequencyComparator(SortComparator.DESCENDING));
      }




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

      Message: 8
      Date: Mon, 09 Jul 2012 03:53:34 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf Configuration.java,1.6,1.7
      To: marf-cvs@...
      Message-ID:
      <mailman.52588.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf

      Modified Files:
      Configuration.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: Configuration.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Configuration.java,v
      retrieving revision 1.6
      retrieving revision 1.7
      diff -C2 -d -r1.6 -r1.7
      *** Configuration.java 8 Mar 2011 02:55:49 -0000 1.6
      --- Configuration.java 9 Jul 2012 03:53:32 -0000 1.7
      ***************
      *** 16,24 ****
      * </p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      * @since 0.3.0.6
      ! * @version $Revision$
      */
      public class Configuration
      --- 16,22 ----
      * </p>
      *
      * @author Serguei Mokhov
      * @since 0.3.0.6
      ! * @version $Id$
      */
      public class Configuration
      ***************
      *** 26,29 ****
      --- 24,32 ----
      {
      /**
      + * For serialization versioning.
      + */
      + private static final long serialVersionUID = -5710879938672379718L;
      +
      + /**
      * Indicates what preprocessing method to use in the pipeline.
      */




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

      Message: 9
      Date: Mon, 09 Jul 2012 03:53:34 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Classification/Distance
      HammingDistance.java, 1.2, 1.3 MinkowskiDistance.java, 1.12, 1.13
      To: marf-cvs@...
      Message-ID:
      <mailman.52589.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/Classification/Distance
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/Classification/Distance

      Modified Files:
      HammingDistance.java MinkowskiDistance.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: MinkowskiDistance.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Classification/Distance/MinkowskiDistance.java,v
      retrieving revision 1.12
      retrieving revision 1.13
      diff -C2 -d -r1.12 -r1.13
      *** MinkowskiDistance.java 31 Dec 2007 00:17:04 -0000 1.12
      --- MinkowskiDistance.java 9 Jul 2012 03:53:32 -0000 1.13
      ***************
      *** 1,4 ****
      --- 1,5 ----
      package marf.Classification.Distance;

      + import java.io.Serializable;
      import java.util.Vector;

      ***************
      *** 10,17 ****
      * <p>Class MinkowskiDistance.</p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      ! * @version $Revision$
      * @since 0.2.0
      */
      --- 11,16 ----
      * <p>Class MinkowskiDistance.</p>
      *
      * @author Serguei Mokhov
      ! * @version $Id$
      * @since 0.2.0
      */
      ***************
      *** 45,49 ****
      if(MARF.getModuleParams() != null)
      {
      ! Vector oParams = MARF.getModuleParams().getClassificationParams();

      if(oParams.size() > 1)
      --- 44,48 ----
      if(MARF.getModuleParams() != null)
      {
      ! Vector<Serializable> oParams = MARF.getModuleParams().getClassificationParams();

      if(oParams.size() > 1)

      Index: HammingDistance.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Classification/Distance/HammingDistance.java,v
      retrieving revision 1.2
      retrieving revision 1.3
      diff -C2 -d -r1.2 -r1.3
      *** HammingDistance.java 31 Dec 2007 00:17:04 -0000 1.2
      --- HammingDistance.java 9 Jul 2012 03:53:32 -0000 1.3
      ***************
      *** 8,15 ****
      * <p>Hamming Distance Classifier.</p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      ! * @version $Revision$
      * @since 0.3.0.6
      */
      --- 8,13 ----
      * <p>Hamming Distance Classifier.</p>
      *
      * @author Serguei Mokhov
      ! * @version $Id$
      * @since 0.3.0.6
      */
      ***************
      *** 18,21 ****
      --- 16,24 ----
      {
      /**
      + * For serialization versioning.
      + */
      + private static final long serialVersionUID = -5941853501910208073L;
      +
      + /**
      * Default allowed difference between two features of 0.01.
      */




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

      Message: 10
      Date: Mon, 09 Jul 2012 03:53:35 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs]
      marf/src/marf/FeatureExtraction/RawFeatureExtraction
      RawFeatureExtraction.java, 1.2, 1.3
      To: marf-cvs@...
      Message-ID:
      <mailman.52590.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/FeatureExtraction/RawFeatureExtraction
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/FeatureExtraction/RawFeatureExtraction

      Modified Files:
      RawFeatureExtraction.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: RawFeatureExtraction.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/FeatureExtraction/RawFeatureExtraction/RawFeatureExtraction.java,v
      retrieving revision 1.2
      retrieving revision 1.3
      diff -C2 -d -r1.2 -r1.3
      *** RawFeatureExtraction.java 22 Feb 2009 02:16:01 -0000 1.2
      --- RawFeatureExtraction.java 9 Jul 2012 03:53:33 -0000 1.3
      ***************
      *** 18,30 ****
      * </p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      * @since 0.3.0.6
      ! * @version $Revision$
      */
      public class RawFeatureExtraction
      extends FeatureExtraction
      {
      public static final int MODE_RAW_PASS_THROUGH = 0;

      --- 18,33 ----
      * </p>
      *
      * @author Serguei Mokhov
      * @since 0.3.0.6
      ! * @version $Id$
      */
      public class RawFeatureExtraction
      extends FeatureExtraction
      {
      + /**
      + * For serialization versioning.
      + */
      + private static final long serialVersionUID = 3373111942101382658L;
      +
      public static final int MODE_RAW_PASS_THROUGH = 0;





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

      Message: 11
      Date: Mon, 09 Jul 2012 03:53:34 +0000
      From: "Serguei A. Mokhov" <mokhov@...>
      Subject: [marf-cvs] marf/src/marf/Classification/RandomClassification
      RandomClassification.java, 1.21, 1.22
      To: marf-cvs@...
      Message-ID:
      <mailman.52591.1341806016.23886.marf-cvs@...>

      Update of /cvsroot/marf/marf/src/marf/Classification/RandomClassification
      In directory vz-cvs-4.sog:/tmp/cvs-serv30175/marf/Classification/RandomClassification

      Modified Files:
      RandomClassification.java
      Log Message:
      Do some maintenance for type checks, serialver, and some warnings put
      to debug.


      Index: RandomClassification.java
      ===================================================================
      RCS file: /cvsroot/marf/marf/src/marf/Classification/RandomClassification/RandomClassification.java,v
      retrieving revision 1.21
      retrieving revision 1.22
      diff -C2 -d -r1.21 -r1.22
      *** RandomClassification.java 31 Dec 2007 00:17:04 -0000 1.21
      --- RandomClassification.java 9 Jul 2012 03:53:32 -0000 1.22
      ***************
      *** 20,27 ****
      * If they are not, debug them.</p>
      *
      - * $Id$
      - *
      * @author Serguei Mokhov
      ! * @version $Revision$
      * @since 0.2.0
      */
      --- 20,25 ----
      * If they are not, debug them.</p>
      *
      * @author Serguei Mokhov
      ! * @version $Id$
      * @since 0.2.0
      */
      ***************
      *** 32,36 ****
      * Vector of integer IDs.
      */
      ! private Vector oIDs = new Vector();

      /**
      --- 30,34 ----
      * Vector of integer IDs.
      */
      ! private Vector<Integer> oIDs = new Vector<Integer>();

      /**
      ***************
      *** 86,90 ****
      Debug.debug("RandomClassification.classify() --- ID set is of 0 length.");

      ! this.oIDs.add(new Integer(iFirstID));

      this.oResultSet.addResult
      --- 84,88 ----
      Debug.debug("RandomClassification.classify() --- ID set is of 0 length.");

      ! this.oIDs.add(iFirstID);

      this.oResultSet.addResult
      ***************
      *** 100,104 ****
      // Collect for stats
      // XXX: Move to StatsCollector
      ! iFirstID = ((Integer)this.oIDs.elementAt((int)(this.oIDs.size() * (new Random().nextDouble())))).intValue();
      iSecondID = iFirstID;

      --- 98,102 ----
      // Collect for stats
      // XXX: Move to StatsCollector
      ! iFirstID = this.oIDs.elementAt((int)(this.oIDs.size() * (new Random().nextDouble())));
      iSecondID = iFirstID;

      ***************
      *** 106,110 ****
      while(iSecondID == iFirstID && this.oIDs.size() > 1)
      {
      ! iSecondID = ((Integer)this.oIDs.elementAt((int)(this.oIDs.size() * (new Random().nextDouble())))).intValue();
      }

      --- 104,108 ----
      while(iSecondID == iFirstID && this.oIDs.size() > 1)
      {
      ! iSecondID = this.oIDs.elementAt((int)(this.oIDs.size() * (new Random().nextDouble())));
      }

      ***************
      *** 142,146 ****
      try
      {
      ! Integer oIntegerID = new Integer(MARF.getCurrentSubject());

      restore();
      --- 140,144 ----
      try
      {
      ! Integer oIntegerID = MARF.getCurrentSubject();

      restore();
      ***************
      *** 217,221 ****
      if(this.oIDs == null)
      {
      ! this.oIDs = new Vector();
      this.oObjectToSerialize = this.oIDs;
      }
      --- 215,219 ----
      if(this.oIDs == null)
      {
      ! this.oIDs = new Vector<Integer>();
      this.oObjectToSerialize = this.oIDs;
      }
      ***************
      *** 226,232 ****
      * @since 0.3.0.6
      */
      public synchronized void backSynchronizeObject()
      {
      ! this.oIDs = (Vector)this.oObjectToSerialize;
      }

      --- 224,231 ----
      * @since 0.3.0.6
      */
      + @SuppressWarnings("unchecked")
      public synchronized void backSynchronizeObject()
      {
      ! this.oIDs = (Vector<Integer>)this.oObjectToSerialize;
      }





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

      ------------------------------------------------------------------------------
      Live Security Virtual Conference
      Exclusive live event will cover all the ways today's security and
      threat landscape has changed and how IT managers can respond. Discussions
      will include endpoint security, mobile security and the latest in malware
      threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

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

      _______________________________________________
      marf-cvs mailing list
      marf-cvs@...
      https://lists.sourceforge.net/lists/listinfo/marf-cvs


      End of marf-cvs Digest, Vol 25, Issue 1
      ***************************************
    • Show all 2 messages in this topic