[marf-cvs] marf/src/marf/Storage Cluster.java, 1.16, 1.17 FeatureSet.java, 1.17, 1.18 TrainingSampl
Brought to you by:
mokhov
Menu
▾
▴
[marf-cvs] marf/src/marf/Storage Cluster.java, 1.16, 1.17 FeatureSet.java, 1.17, 1.18 TrainingSample.java, 1.12, 1.13 TrainingSet.java, 1.46, 1.47
|
From: Serguei A. M. <mo...@us...> - 2008-02-17 02:27:12
|
Update of /cvsroot/marf/marf/src/marf/Storage In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16057/Storage Modified Files: Cluster.java FeatureSet.java TrainingSample.java TrainingSet.java Log Message: Implement toString() for TrainingSet, TrainingSample, FeatureSet, and Cluster classes primarily for debugging and browsing purposes. Export a public static version of loadTrainingSet() in Classification (and make the private one to use it) to allow easier access to the training set data by external classes and applications. This will allow visualizing previously stored training sets. Index: TrainingSet.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/TrainingSet.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** TrainingSet.java 5 Aug 2007 22:01:34 -0000 1.46 --- TrainingSet.java 17 Feb 2008 02:26:54 -0000 1.47 *************** *** 6,10 **** import java.io.FileReader; import java.io.FileWriter; - import java.util.Hashtable; import java.util.Vector; --- 6,9 ---- *************** *** 362,366 **** * @since 0.3.0.6 */ ! public void setITrainingSetFormat(int piTrainingSetFormat) { this.iTrainingSetFormat = piTrainingSetFormat; --- 361,365 ---- * @since 0.3.0.6 */ ! public void setTrainingSetFormat(int piTrainingSetFormat) { this.iTrainingSetFormat = piTrainingSetFormat; *************** *** 415,418 **** --- 414,438 ---- /** + * Provides string representation of the training set data in addition + * to that of the parent StorageManager. + * @see marf.Storage.StorageManager#toString() + * @since 0.3.0.6 + */ + public synchronized String toString() + { + StringBuffer oBuffer = new StringBuffer(super.toString()); + + oBuffer + .append("Training Set Format: ").append(this.iTrainingSetFormat).append("\n") + .append("Preprocessing Method: ").append(this.iPreprocessingMethod).append("\n") + .append("Feature Extraction Method: ").append(this.iPreprocessingMethod).append("\n") + .append("Size: ").append(size()).append("\n") + .append("Training Set Samples: ").append(this.oTrainingSamples).append("\n") + .append("Source code revision: ").append(getMARFSourceCodeRevision()).append("\n"); + + return oBuffer.toString(); + } + + /** * Returns source code revision information. * @return revision string Index: TrainingSample.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/TrainingSample.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TrainingSample.java 23 Dec 2007 06:29:46 -0000 1.12 --- TrainingSample.java 17 Feb 2008 02:26:54 -0000 1.13 *************** *** 327,330 **** --- 327,349 ---- /** + * Provides string representation of the training sample data. + * @see java.lang.Object#toString() + * @since 0.3.0.6 + */ + public String toString() + { + StringBuffer oBuffer = new StringBuffer(); + + oBuffer + .append("Subject ID: ").append(this.iSubjectID).append("\n") + .append("Data vector reference: ").append(this.adDataVector).append("\n") + .append("Size: ").append(size()).append("\n") + .append("Filenames: ").append(this.oFilenames).append("\n") + .append("TrainingSample Source code revision: ").append(getMARFSourceCodeRevision()).append("\n"); + + return oBuffer.toString(); + } + + /** * Returns source code revision information. * @return revision string Index: Cluster.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/Cluster.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Cluster.java 23 Dec 2007 06:29:46 -0000 1.16 --- Cluster.java 17 Feb 2008 02:26:53 -0000 1.17 *************** *** 23,27 **** /** * How many times the mean was computed. ! * Used in recomputation of it. */ // protected int iMeanCount = 0; --- 23,27 ---- /** * How many times the mean was computed. ! * Used in recomputation of it when new data is coming in. */ // protected int iMeanCount = 0; *************** *** 225,228 **** --- 225,245 ---- /** + * Provides string representation of the training set data in addition + * to that of the parent TrainingSample. + * @see marf.Storage.TrainingSample#toString() + * @since 0.3.0.6 + */ + public synchronized String toString() + { + StringBuffer oBuffer = new StringBuffer(super.toString()); + + oBuffer + .append("Mean Count: ").append(this.iMeanCount).append("\n") + .append("Cluster Source code revision: ").append(getMARFSourceCodeRevision()).append("\n"); + + return oBuffer.toString(); + } + + /** * Returns source code revision information. * @return revision string Index: FeatureSet.java =================================================================== RCS file: /cvsroot/marf/marf/src/marf/Storage/FeatureSet.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FeatureSet.java 23 Dec 2007 06:29:46 -0000 1.17 --- FeatureSet.java 17 Feb 2008 02:26:53 -0000 1.18 *************** *** 28,35 **** --- 28,57 ---- protected Vector oFeatureVectors = new Vector(); + /** + * Cached vector's data is invalid (untrustworthy), i.e. + * was either never computed yet or some other operation + * on the class invalidated it. + * @since 0.3.0.6 + */ private static final int CACHED_VECTOR_TYPE_INVALID = -1; + + /** + * The cached vector data represents a freshly computed <em>mean</em> vector. + * @since 0.3.0.6 + */ private static final int CACHED_VECTOR_TYPE_MEAN = 1; + + /** + * The cached vector data represents a freshly computed <em>median</em> vector. + * @since 0.3.0.6 + */ private static final int CACHED_VECTOR_TYPE_MEDIAN = 2; + /** + * Type of the primary vector data member computed last. + * @see CACHED_VECTOR_TYPE_INVALID + * @see CACHED_VECTOR_TYPE_MEAN + * @see CACHED_VECTOR_TYPE_MEDIAN + */ private int iLastTypeVectorComputed = CACHED_VECTOR_TYPE_INVALID; *************** *** 288,291 **** --- 310,332 ---- /** + * Provides string representation of the training set data in addition + * to that of the parent Cluster. + * @see marf.Storage.Cluster#toString() + * @since 0.3.0.6 + */ + public synchronized String toString() + { + StringBuffer oBuffer = new StringBuffer(super.toString()); + + oBuffer + .append("Max Columns: ").append(this.iMaxColumns).append("\n") + .append("Last Type Vector Computed: ").append(this.iLastTypeVectorComputed).append("\n") + .append("Feature Vectors: ").append(this.oFeatureVectors).append("\n") + .append("FeatureSet Source code revision: ").append(getMARFSourceCodeRevision()).append("\n"); + + return oBuffer.toString(); + } + + /** * Returns source code revision information. * @return revision string |