Author: gsingers
Date: Fri Oct 31 14:28:46 2008
New Revision: 709574
URL: http://svn.apache.org/viewvc?rev=709574&view=rev
Log:
rename some functions due to Upper case
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesClassifier.java
Fri Oct 31 14:28:46 2008
@@ -93,13 +93,13 @@
/**
* Calculate the document probability as the multiplication of the
- * [EMAIL PROTECTED] org.apache.mahout.common.Model#FeatureWeight(String,
String)} for each word given the label
+ * [EMAIL PROTECTED] org.apache.mahout.common.Model#featureWeight(String,
String)} for each word given the label
*
* @param model The [EMAIL PROTECTED] org.apache.mahout.common.Model}
* @param label The label to calculate the probability of
* @param document The document
* @return The probability
- * @see Model#FeatureWeight(String, String)
+ * @see Model# featureWeight (String, String)
*/
public double documentProbability(Model model, String label, String[]
document) {
double result = 0.0;
@@ -115,7 +115,7 @@
for (Map.Entry<String, Integer> entry : wordList.entrySet()) {
String word = entry.getKey();
int count = entry.getValue();
- result += count * model.FeatureWeight(label, word);
+ result += count * model.featureWeight(label, word);
}
return result;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesModel.java
Fri Oct 31 14:28:46 2008
@@ -64,7 +64,7 @@
}
@Override
- public void InitializeNormalizer() {
+ public void initializeNormalizer() {
double perLabelWeightSumNormalisationFactor = Double.MAX_VALUE;
log.info("{}", thetaNormalizer);
@@ -84,7 +84,7 @@
}
@Override
- public void GenerateModel() {
+ public void generateModel() {
double vocabCount = featureList.size();
double[] perLabelThetaNormalizer = new double[labelList.size()];
@@ -149,7 +149,7 @@
* @return The weighted probability
*/
@Override
- public double FeatureWeight(Integer label, Integer feature) {
+ public double featureWeight(Integer label, Integer feature) {
return getWeight(label, feature);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/io/SequenceFileModelReader.java
Fri Oct 31 14:28:46 2008
@@ -54,7 +54,7 @@
model.initializeWeightMatrix();
loadWeightMatrix(model, fs, pathPatterns.get("weight"), conf);
- model.InitializeNormalizer();
+ model.initializeNormalizer();
//model.GenerateComplementaryModel();
return model;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesClassifier.java
Fri Oct 31 14:28:46 2008
@@ -91,13 +91,13 @@
/**
* Calculate the document probability as the multiplication of the
- * [EMAIL PROTECTED] Model#FeatureWeight(String, String)} for each word
given the label
+ * [EMAIL PROTECTED] Model#featureWeight(String, String)} for each word
given the label
*
* @param model The [EMAIL PROTECTED] org.apache.mahout.common.Model}
* @param label The label to calculate the probability of
* @param document The document
* @return The probability
- * @see Model#FeatureWeight(String, String)
+ * @see Model# featureWeight (String, String)
*/
public double documentProbability(Model model, String label, String[]
document) {
double result = 0.0;
@@ -113,7 +113,7 @@
for (Map.Entry<String, Integer> entry : wordList.entrySet()) {
String word = entry.getKey();
int count = entry.getValue();
- result += count * model.FeatureWeight(label, word);
+ result += count * model.featureWeight(label, word);
}
return result;
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesModel.java
Fri Oct 31 14:28:46 2008
@@ -61,7 +61,7 @@
}
@Override
- public void InitializeNormalizer() {
+ public void initializeNormalizer() {
double perLabelWeightSumNormalisationFactor = Double.MAX_VALUE;
@@ -118,7 +118,7 @@
}
@Override
- public void GenerateModel() {
+ public void generateModel() {
double vocabCount = featureList.size();
double[] perLabelThetaNormalizer = new double[labelList.size()];
@@ -183,7 +183,7 @@
* @return The weighted probability
*/
@Override
- public double FeatureWeight(Integer label, Integer feature) {
+ public double featureWeight(Integer label, Integer feature) {
return getWeight(label, feature);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Classifier.java
Fri Oct 31 14:28:46 2008
@@ -51,13 +51,13 @@
/**
* Calculate the document probability as the multiplication of the
- * [EMAIL PROTECTED] org.apache.mahout.common.Model#FeatureWeight(String,
String)} for each word given the label
+ * [EMAIL PROTECTED] org.apache.mahout.common.Model#featureWeight(String,
String)} for each word given the label
*
* @param model The [EMAIL PROTECTED] org.apache.mahout.common.Model}
* @param label The label to calculate the probability of
* @param document The document
* @return The probability
- * @see Model#FeatureWeight(String, String)
+ * @see Model#featureWeight (String, String)
*/
public double documentProbability(Model model, String label, String[]
document);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java
(original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/Model.java
Fri Oct 31 14:28:46 2008
@@ -53,15 +53,15 @@
protected final double alpha_i = 1.0; // alpha_i can be improved upon for
increased smoothing
- protected abstract double FeatureWeight(Integer label, Integer feature);
+ protected abstract double featureWeight(Integer label, Integer feature);
protected abstract double getWeight(Integer label, Integer feature);
protected abstract double getWeightUnprocessed(Integer label, Integer
feature);
- public abstract void InitializeNormalizer();
+ public abstract void initializeNormalizer();
- public abstract void GenerateModel();
+ public abstract void generateModel();
protected double getSumLabelWeight(Integer label) {
return nullToZero(sumLabelWeight.get(label));
@@ -159,12 +159,12 @@
* @param featureString The feature to calc. the prob. for
* @return The weighted probability
*/
- public double FeatureWeight(String labelString, String featureString) {
+ public double featureWeight(String labelString, String featureString) {
if (featureList.containsKey(featureString) == false)
return 0.0;
Integer feature = getFeature(featureString);
Integer label = getLabel(labelString);
- return FeatureWeight(label, feature);
+ return featureWeight(label, feature);
}
public Collection<String> getLabels() {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java?rev=709574&r1=709573&r2=709574&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/bayes/CBayesClassifierTest.java
Fri Oct 31 14:28:46 2008
@@ -54,7 +54,7 @@
model.setThetaNormalizer("d", -100);
model.setThetaNormalizer("e", -100);
- model.InitializeNormalizer();
+ model.initializeNormalizer();
model.initializeWeightMatrix();
model.loadFeatureWeight("a", "aa", 5);
