From 0d3d8a3a40c4126a09f727bf15ea8bbd3ad81816 Mon Sep 17 00:00:00 2001 From: Aitor Martinez Egurcegui Date: Sat, 3 Oct 2015 11:53:35 +0200 Subject: [PATCH] commit fixing various files for the javadoc file under marytts-builder --- .../dbselection/CoverageFeatureProvider.java | 2 +- .../tools/voiceimport/CARTBuilder.java | 2 ++ .../tools/voiceimport/DatabaseLayout.java | 2 ++ .../voiceimport/HMMParameterExtractor.java | 4 +-- .../voiceimport/PhoneFeatureFileWriter.java | 1 + .../tools/voiceimport/SPTKMFCCExtractor.java | 4 +++ .../tools/voiceimport/TimelineWriter.java | 1 + .../tools/voiceimport/VoiceCompiler.java | 22 +++++++++++++++ .../traintrees/AgglomerativeClusterer.java | 9 ++++++ .../traintrees/ContourTreeInspector.java | 3 ++ .../traintrees/DistanceMeasure.java | 4 +++ .../traintrees/DurationDistanceMeasure.java | 10 +++++++ .../F0ContourPolynomialDistanceMeasure.java | 12 ++++++++ .../tools/voiceimport/traintrees/Wagon.java | 14 +++++++--- .../vocalizations/HNMFeatureFileWriter.java | 12 ++++++++ .../MLSAFeatureFileComputer.java | 28 +++++++++---------- .../vocalizations/MLSAFeatureFileWriter.java | 3 +- .../SnackF0ContourExtractor.java | 4 +++ .../VocalizationF0PolyFeatureFileWriter.java | 9 ++++++ .../VocalizationF0PolynomialInspector.java | 8 ++++-- .../VocalizationFeatureFileWriter.java | 5 ++++ .../VocalizationIntonationWriter.java | 18 ++++++++++++ .../VocalizationPitchmarker.java | 4 +++ .../VocalizationTimelineMaker.java | 1 + .../VocalizationUnitfileWriter.java | 5 ++++ .../classifiers/trees/j48/TreeConverter.java | 4 +++ 26 files changed, 166 insertions(+), 25 deletions(-) diff --git a/marytts-builder/src/main/java/marytts/tools/dbselection/CoverageFeatureProvider.java b/marytts-builder/src/main/java/marytts/tools/dbselection/CoverageFeatureProvider.java index fb02b8d6..4b3ebddb 100644 --- a/marytts-builder/src/main/java/marytts/tools/dbselection/CoverageFeatureProvider.java +++ b/marytts-builder/src/main/java/marytts/tools/dbselection/CoverageFeatureProvider.java @@ -30,7 +30,7 @@ public interface CoverageFeatureProvider { /** * Get the total number of sentences provided by this provider. * - * @param return number of sentences + * @return number of sentences */ public int getNumSentences(); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/CARTBuilder.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/CARTBuilder.java index 34aae1b5..7eb85e65 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/CARTBuilder.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/CARTBuilder.java @@ -317,6 +317,7 @@ public class CARTBuilder extends VoiceImportComponent { * IOException * @throws MaryConfigurationException * MaryConfigurationException + * @return cart */ public CART importCART(String filename, FeatureDefinition featDef) throws IOException, MaryConfigurationException { // open CART-File @@ -346,6 +347,7 @@ public class CARTBuilder extends VoiceImportComponent { * IOException * @throws MaryConfigurationException * MaryConfigurationException + * @return true when done */ public boolean replaceLeaves(CART cart, FeatureDefinition featureDefinition) throws IOException, MaryConfigurationException { try { diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/DatabaseLayout.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/DatabaseLayout.java index f7e593ac..11b3d162 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/DatabaseLayout.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/DatabaseLayout.java @@ -864,6 +864,8 @@ public class DatabaseLayout { /** * Get all props of all components as an Array representation for displaying with the SettingsGUI. Does not include uneditable * props. + * + * @return result */ public String[][] getAllPropsForDisplay() { List keys = new ArrayList(); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/HMMParameterExtractor.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/HMMParameterExtractor.java index 52e619ac..a66ff700 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/HMMParameterExtractor.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/HMMParameterExtractor.java @@ -185,8 +185,8 @@ public class HMMParameterExtractor extends VoiceImportComponent { * outputDir * @throws IOException * IOException - * @param InterruptedException - * InterruptedException + * @throws InterruptedException + * InterruptedException */ public void generateParameters(String file, String contextFeaDir, String outputDir) throws IOException, InterruptedException { diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/PhoneFeatureFileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/PhoneFeatureFileWriter.java index 5de1a247..f9246585 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/PhoneFeatureFileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/PhoneFeatureFileWriter.java @@ -217,6 +217,7 @@ public class PhoneFeatureFileWriter extends VoiceImportComponent { * @param out * out * @throws IOException + * IOException */ protected void writeHeaderTo(DataOutput out) throws IOException { new MaryHeader(MaryHeader.UNITFEATS).writeTo(out); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/SPTKMFCCExtractor.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/SPTKMFCCExtractor.java index 42fd86d5..0f3e0ce4 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/SPTKMFCCExtractor.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/SPTKMFCCExtractor.java @@ -130,6 +130,10 @@ public class SPTKMFCCExtractor extends VoiceImportComponent { /*** * Calculate mfcc using SPTK, uses sox to convert wav→raw * + * @param inFile + * inFile + * @param outFile + * outFile * @throws IOException * IOException * @throws InterruptedException diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/TimelineWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/TimelineWriter.java index b3cdf56c..60ab4488 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/TimelineWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/TimelineWriter.java @@ -166,6 +166,7 @@ public class TimelineWriter { * * @throws IOException * IOException + * @return raf.getFilePointer */ public synchronized long getBytePointer() throws IOException { return (raf.getFilePointer()); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/VoiceCompiler.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/VoiceCompiler.java index 1c468578..9cb1e258 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/VoiceCompiler.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/VoiceCompiler.java @@ -218,6 +218,28 @@ public class VoiceCompiler extends VoiceImportComponent { /** * @deprecated Use constructor with path to Maven instead. + * @param compileDir + * compileDir + * @param voiceName + * voiceName + * @param voiceVersion + * voiceVersion + * @param locale + * locale + * @param gender + * gender + * @param domain + * domain + * @param samplingRate + * samplingRate + * @param isUnitSelectionVoice + * isUnitSelectionVoice + * @param filesForResources + * filesForResources + * @param filesForFilesystem + * filesForFilesystem + * @param extraVariablesToSubstitute + * extraVariablesToSubstitute */ @Deprecated public MavenVoiceCompiler(File compileDir, String voiceName, String voiceVersion, Locale locale, String gender, diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/AgglomerativeClusterer.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/AgglomerativeClusterer.java index 1028ae38..60c2d4b6 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/AgglomerativeClusterer.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/AgglomerativeClusterer.java @@ -334,6 +334,10 @@ public class AgglomerativeClusterer { /** * Estimate the mean of all *distances* in the training set. + * + * @param leaves + * leaves + * @return computeglobalimpurity(leaves, double.Positive_infinity) */ /* * private void estimateGlobalMean(FeatureVector[] data, DistanceMeasure dist) { int sampleSize = 100000; @@ -357,7 +361,9 @@ public class AgglomerativeClusterer { * Compute global impurity as the weighted sum of leaf impurities. stop when cutoff value is reached or surpassed. * * @param leaves + * leaves * @param cutoff + * cutoff * @return gi */ private double computeGlobalImpurity(List leaves, double cutoff) { @@ -399,6 +405,7 @@ public class AgglomerativeClusterer { * where |l| = the number of instances in the leaf. * * @param leaf + * leaf * @return impurity */ /* @@ -459,7 +466,9 @@ public class AgglomerativeClusterer { * |l| = number of instances in the leaf l * * @param dgn1 + * dgn1 * @param dgn2 + * dgn2 * @return deltaGI */ private double computeMutualDistanceDeltaGI(DirectedGraphNode dgn1, DirectedGraphNode dgn2) { diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/ContourTreeInspector.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/ContourTreeInspector.java index bb67f2b8..30dac375 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/ContourTreeInspector.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/ContourTreeInspector.java @@ -38,6 +38,9 @@ public class ContourTreeInspector { /** * @param args + * args + * @throws Exception + * Exception */ public static void main(String[] args) throws Exception { boolean showIndividualLeaves = true; diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DistanceMeasure.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DistanceMeasure.java index a954b8e1..551d9587 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DistanceMeasure.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DistanceMeasure.java @@ -31,7 +31,9 @@ public interface DistanceMeasure { * Compute the distance between two feature vectors. * * @param fv1 + * fv1 * @param fv2 + * fv2 * @return a non-negative float */ public float distance(FeatureVector fv1, FeatureVector fv2); @@ -40,7 +42,9 @@ public interface DistanceMeasure { * Compute the squared distance between two feature vectors. * * @param fv1 + * fv1 * @param fv2 + * fv2 * @return a non-negative float */ public float squaredDistance(FeatureVector fv1, FeatureVector fv2); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DurationDistanceMeasure.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DurationDistanceMeasure.java index 7427ae46..4bd5d1fd 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DurationDistanceMeasure.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/DurationDistanceMeasure.java @@ -40,6 +40,11 @@ public class DurationDistanceMeasure implements DistanceMeasure { * Compute the distance between the f0 contours corresponding to the given feature vectors. From the feature vectors, only * their unit index number is used. * + * @param fv1 + * fv1 + * @param fv2 + * fv2 + * @return math.abs(d1 - d2) * @see marytts.tools.voiceimport.traintrees.DistanceMeasure#distance(marytts.features.FeatureVector, * marytts.features.FeatureVector) */ @@ -53,6 +58,11 @@ public class DurationDistanceMeasure implements DistanceMeasure { * Compute the distance between the f0 contours corresponding to the given feature vectors. From the feature vectors, only * their unit index number is used. * + * @param fv1 + * fv1 + * @param fv2 + * fv2 + * @return diff * diff * @see marytts.tools.voiceimport.traintrees.DistanceMeasure#distance(marytts.features.FeatureVector, * marytts.features.FeatureVector) */ diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/F0ContourPolynomialDistanceMeasure.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/F0ContourPolynomialDistanceMeasure.java index b0a9c6db..fd11cabd 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/F0ContourPolynomialDistanceMeasure.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/F0ContourPolynomialDistanceMeasure.java @@ -44,6 +44,11 @@ public class F0ContourPolynomialDistanceMeasure implements DistanceMeasure { * Compute the distance between the f0 contours corresponding to the given feature vectors. From the feature vectors, only * their unit index number is used. * + * @param fv1 + * fv1 + * @param fv2 + * fv2 + * @return dist * @see marytts.tools.voiceimport.traintrees.DistanceMeasure#distance(marytts.features.FeatureVector, * marytts.features.FeatureVector) */ @@ -56,6 +61,11 @@ public class F0ContourPolynomialDistanceMeasure implements DistanceMeasure { * Compute the distance between the f0 contours corresponding to the given feature vectors. From the feature vectors, only * their unit index number is used. * + * @param fv1 + * fv1 + * @param fv2 + * fv2 + * @return dist * @see marytts.tools.voiceimport.traintrees.DistanceMeasure#distance(marytts.features.FeatureVector, * marytts.features.FeatureVector) */ @@ -73,6 +83,7 @@ public class F0ContourPolynomialDistanceMeasure implements DistanceMeasure { * Compute the mean polynomial from the given set of polynomials. * * @param fvs + * fvs * @return mean */ public float[] computeMean(FeatureVector[] fvs) { @@ -88,6 +99,7 @@ public class F0ContourPolynomialDistanceMeasure implements DistanceMeasure { * Compute the variance of the given set of feature vectors. * * @param fvs + * fvs * @return variance */ public double computeVariance(FeatureVector[] fvs) { diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/Wagon.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/Wagon.java index e6a0d392..05ac3ea2 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/Wagon.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/traintrees/Wagon.java @@ -74,12 +74,20 @@ public class Wagon implements Runnable { /** * Set up a new wagon process. Wagon.setWagonExecutable() must be called beforehand. * + * @param id + * id * @param featureDefinition + * featureDefinition * @param featureVectors + * featureVectors * @param aDistanceMeasure + * aDistanceMeasure * @param dir + * dir * @param balance + * balance * @param stop + * stop * @throws IOException * if there was no call to Wagon.setWagonExecutable() with an executable file before calling this constructor. */ @@ -105,10 +113,8 @@ public class Wagon implements Runnable { /** * Export this feature definition in the "all.desc" format which can be read by wagon. * - * @param out - * the destination of the data - * @param featuresToIgnore - * a set of Strings containing the names of features that wagon should ignore. Can be null. + * @throws IOException + * IOException */ private void createDescFile() throws IOException { PrintWriter out = new PrintWriter(new FileOutputStream(descFile)); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/HNMFeatureFileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/HNMFeatureFileWriter.java index 86a50ec8..a99d77d6 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/HNMFeatureFileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/HNMFeatureFileWriter.java @@ -146,6 +146,9 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { /** * Initialize this component + * + * @throws Exception + * Exception */ @Override protected void initialiseComp() throws Exception { @@ -184,7 +187,9 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { * Create new directory if the directory doesn't exist * * @param dirName + * dirName * @throws Exception + * Exception */ private void createDirectoryifNotExists(String dirName) throws Exception { if (!(new File(dirName)).exists()) { @@ -200,7 +205,9 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { * Write the header of this feature file to the given DataOutput * * @param out + * out * @throws IOException + * IOException */ protected void writeHeaderTo(DataOutput out) throws IOException { new MaryHeader(MaryHeader.LISTENERFEATS).writeTo(out); @@ -208,6 +215,8 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { /** * Return this voice import component name + * + * @return "HNMfeatureFileWriter" */ @Override public String getName() { @@ -216,6 +225,8 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { /** * Return the progress of this component + * + * @return this.progress */ @Override public int getProgress() { @@ -224,6 +235,7 @@ public class HNMFeatureFileWriter extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileComputer.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileComputer.java index bb11c465..c66e4fc9 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileComputer.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileComputer.java @@ -111,6 +111,9 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * compute logf0, mgc, strength features + * + * @throws Exception + * Exception */ @Override public boolean compute() throws Exception { @@ -248,12 +251,8 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * Compute LF0 features for all RAW files using Snack and SPTK * - * @throws IOException + * @throws Exception * if can't run command - * @throws ExecutionException - * if commandline throws an error - * @throws ExecutionException - * if there is no output file or output file is empty */ private void computeLF0Features() throws Exception { String bcCommand = "/usr/bin/bc"; @@ -285,12 +284,8 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * Compute MGC features for all RAW files using SPTK * - * @throws IOException + * @throws Exception * if can't run command - * @throws ExecutionException - * if commandline throws an error - * @throws ExecutionException - * if there is no output file or output file is empty */ private void computeMGCFeatures() throws Exception { @@ -321,12 +316,8 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * Compute STRENGTH features for all RAW files using SPTK * - * @throws IOException + * @throws Exception * if can't run command - * @throws ExecutionException - * if commandline throws an error - * @throws ExecutionException - * if there is no output file or output file is empty */ private void computeSTRFeatures() throws Exception { String bcCommand = "/usr/bin/bc"; @@ -359,7 +350,9 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { * Create new directory if the directory doesn't exist * * @param dirName + * dirName * @throws Exception + * Exception */ private void createDirectoryifNotExists(String dirName) throws Exception { if (!(new File(dirName)).exists()) { @@ -373,6 +366,8 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * Return this voice import component name + * + * @return "MLSAFeatureFileComputer" */ @Override public String getName() { @@ -381,6 +376,8 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * Return the progress of this component + * + * @return this.progress */ @Override public int getProgress() { @@ -389,6 +386,7 @@ public class MLSAFeatureFileComputer extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileWriter.java index 7c16e1ec..f96341e9 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/MLSAFeatureFileWriter.java @@ -181,7 +181,7 @@ public class MLSAFeatureFileWriter extends VoiceImportComponent { /** * Initialize this component * - * @throws MaryConfigurationException + * @throws Exception * if there is problem with basename list */ @Override @@ -249,6 +249,7 @@ public class MLSAFeatureFileWriter extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/SnackF0ContourExtractor.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/SnackF0ContourExtractor.java index 41152e24..cec885cf 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/SnackF0ContourExtractor.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/SnackF0ContourExtractor.java @@ -122,7 +122,10 @@ public class SnackF0ContourExtractor extends VoiceImportComponent { /** * The standard compute() method of the VoiceImportComponent interface. * + * @throws IOException + * IOException * @throws InterruptedException + * InterruptedException */ public boolean compute() throws IOException, InterruptedException { @@ -195,6 +198,7 @@ public class SnackF0ContourExtractor extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolyFeatureFileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolyFeatureFileWriter.java index 33685a54..e1f8cd4d 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolyFeatureFileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolyFeatureFileWriter.java @@ -184,9 +184,13 @@ public class VocalizationF0PolyFeatureFileWriter extends VoiceImportComponent { /** * @param out + * out * @throws IOException + * IOException * @throws UnsupportedEncodingException + * UnsupportedEncodingException * @throws FileNotFoundException + * FileNotFoundException */ protected void writeUnitFeaturesTo(DataOutput out) throws IOException, UnsupportedEncodingException, FileNotFoundException { int numUnits = listenerUnits.getNumberOfUnits(); @@ -456,7 +460,9 @@ public class VocalizationF0PolyFeatureFileWriter extends VoiceImportComponent { * Write the header of this feature file to the given DataOutput * * @param out + * out * @throws IOException + * IOException */ protected void writeHeaderTo(DataOutput out) throws IOException { new MaryHeader(MaryHeader.LISTENERFEATS).writeTo(out); @@ -474,6 +480,9 @@ public class VocalizationF0PolyFeatureFileWriter extends VoiceImportComponent { /** * @param args + * args + * @throws Exception + * Exception */ public static void main(String[] args) throws Exception { VocalizationF0PolyFeatureFileWriter acfeatsWriter = new VocalizationF0PolyFeatureFileWriter(); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolynomialInspector.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolynomialInspector.java index 8c5176ff..fdf93864 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolynomialInspector.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationF0PolynomialInspector.java @@ -192,10 +192,11 @@ public class VocalizationF0PolynomialInspector extends VoiceImportComponent { /** * @param baseName + * baseName * @throws IOException + * IOException * @throws UnsupportedAudioFileException - * @throws UnsupportedEncodingException - * @throws FileNotFoundException + * UnsupportedAudioFileException */ protected void displaySentences(String baseName) throws IOException, UnsupportedAudioFileException { /* @@ -439,6 +440,9 @@ public class VocalizationF0PolynomialInspector extends VoiceImportComponent { /** * @param args + * args + * @throws Exception + * Exception */ public static void main(String[] args) throws Exception { VocalizationF0PolynomialInspector acfeatsWriter = new VocalizationF0PolynomialInspector(); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationFeatureFileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationFeatureFileWriter.java index f1d45586..7a047758 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationFeatureFileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationFeatureFileWriter.java @@ -250,7 +250,9 @@ public class VocalizationFeatureFileWriter extends VoiceImportComponent { * Write the header of this feature file to the given DataOutput * * @param out + * out * @throws IOException + * IOException */ protected void writeHeaderTo(DataOutput out) throws IOException { new MaryHeader(MaryHeader.LISTENERFEATS).writeTo(out); @@ -268,6 +270,9 @@ public class VocalizationFeatureFileWriter extends VoiceImportComponent { /** * @param args + * args + * @throws Exception + * Exception */ public static void main(String[] args) throws Exception { VocalizationFeatureFileWriter acfeatsWriter = new VocalizationFeatureFileWriter(); diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationIntonationWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationIntonationWriter.java index a95ecae8..b2158756 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationIntonationWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationIntonationWriter.java @@ -143,6 +143,9 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * Reads and concatenates a list of waveforms into one single timeline file. * * @throws IOException + * IOException + * @throws MaryConfigurationException + * MaryConfigurationException */ @Override public boolean compute() throws IOException, MaryConfigurationException { @@ -169,7 +172,9 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { /** * * @param out + * out * @throws IOException + * IOException */ protected void writeUnitFeaturesTo(DataOutput out) throws IOException { @@ -218,9 +223,14 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * get f0 contour of vocalization f0 * * @param baseName + * baseName + * @param doInterpolate + * doInterpolate * @return interpolateF0Array(f0Array) if doInterpolate, f0Array otherwise * @throws UnsupportedAudioFileException + * UnsupportedAudioFileException * @throws IOException + * IOException */ private double[] getVocalizationF0(String baseName, boolean doInterpolate) throws UnsupportedAudioFileException, IOException { @@ -271,6 +281,7 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * to get polynomial coeffs of f0 contour * * @param f0Array + * f0Array * @return null if f0Array == null, coeffs otherwise */ private double[] getPolynomialCoeffs(double[] f0Array) { @@ -290,6 +301,7 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * to interpolate F0 contour values * * @param f0Array + * f0Array * @return null if f0Array == null, f0AndInterpolate */ private double[] interpolateF0Array(double[] f0Array) { @@ -345,6 +357,7 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * cut begin-end unvoiced segments * * @param array + * array * @return null if array == null, newArray */ private double[] cutStartEndUnvoicedSegments(double[] array) { @@ -387,7 +400,9 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * interpolate f0 * * @param f0Array + * f0Array * @param interpol + * interpol * @return f0AndInterpolate */ private double[] combineF0andInterpolate(double[] f0Array, double[] interpol) { @@ -409,7 +424,9 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { * Write the header of this feature file to the given DataOutput * * @param out + * out * @throws IOException + * IOException */ protected void writeHeaderTo(DataOutput out) throws IOException { new MaryHeader(MaryHeader.LISTENERFEATS).writeTo(out); @@ -426,6 +443,7 @@ public class VocalizationIntonationWriter extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationPitchmarker.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationPitchmarker.java index 354ea0cd..72a15e18 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationPitchmarker.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationPitchmarker.java @@ -92,6 +92,9 @@ public class VocalizationPitchmarker extends PraatPitchmarker { /** * The standard compute() method of the VoiceImportComponent interface. + * + * @throws IOException + * IOException */ public boolean compute() throws IOException { @@ -151,6 +154,7 @@ public class VocalizationPitchmarker extends PraatPitchmarker { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationTimelineMaker.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationTimelineMaker.java index 48d23610..03015000 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationTimelineMaker.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationTimelineMaker.java @@ -224,6 +224,7 @@ public class VocalizationTimelineMaker extends VoiceImportComponent { /** * @param args + * args */ public static void main(String[] args) { // TODO Auto-generated method stub diff --git a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationUnitfileWriter.java b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationUnitfileWriter.java index efb1863c..3c09bf32 100644 --- a/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationUnitfileWriter.java +++ b/marytts-builder/src/main/java/marytts/tools/voiceimport/vocalizations/VocalizationUnitfileWriter.java @@ -230,6 +230,9 @@ public class VocalizationUnitfileWriter extends VoiceImportComponent { /** * @param labFile + * labFile + * @throws IOException + * IOException * @return ulab */ private UnitLabel[] readLabFile(String labFile) throws IOException { @@ -282,8 +285,10 @@ public class VocalizationUnitfileWriter extends VoiceImportComponent { * To get Label Unit DATA (time stamp, index, phone unit) * * @param line + * line * @return ArrayList contains time stamp, index and phone unit * @throws IOException + * IOException */ private ArrayList getLabelUnitData(String line) throws IOException { if (line == null) diff --git a/marytts-builder/src/main/java/weka/classifiers/trees/j48/TreeConverter.java b/marytts-builder/src/main/java/weka/classifiers/trees/j48/TreeConverter.java index 66965ac5..c7f0ed9b 100644 --- a/marytts-builder/src/main/java/weka/classifiers/trees/j48/TreeConverter.java +++ b/marytts-builder/src/main/java/weka/classifiers/trees/j48/TreeConverter.java @@ -42,6 +42,8 @@ public class TreeConverter { * This converts the WEKA-style ClassifierTree into a Mary CART tree. The FeatureDefinition and the Instances should conform * with respect to the possible attributes and values. * + * @param c45Tree + * c45Tree * @param aFeatDef * a FeatureDefinition storing possible attributes and values as they are used within MARY. * @param inst @@ -76,6 +78,8 @@ public class TreeConverter { * This converts the WEKA-style ClassifierTree into a Mary CART tree. The FeatureDefinition and the Instances should conform * with respect to the possible attributes and values. * + * @param c45Tree + * c45Tree * @param aFeatDef * a FeatureDefinition storing possible attributes and values as they are used within MARY. * @param inst