Author: koji
Date: Sat Dec 29 04:16:04 2012
New Revision: 1426701
URL: http://svn.apache.org/viewvc?rev=1426701&view=rev
Log:
rename HistogramMatcher to DistanceCalculator
Modified:
labs/alike/trunk/demo/demo-conf.xml
labs/alike/trunk/src/java/org/apache/alike/AlikeConfig.java
labs/alike/trunk/src/java/org/apache/alike/QuantizeVectors.java
labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java
labs/alike/trunk/src/test/test-files/valid-conf.xml
Modified: labs/alike/trunk/demo/demo-conf.xml
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/demo/demo-conf.xml?rev=1426701&r1=1426700&r2=1426701&view=diff
==============================================================================
--- labs/alike/trunk/demo/demo-conf.xml (original)
+++ labs/alike/trunk/demo/demo-conf.xml Sat Dec 29 04:16:04 2012
@@ -38,7 +38,7 @@
</clustering>
<vectorQuantization>
- <histogramMatcher
class="org.apache.alike.EuclideanDistanceHistogramMatcher"/>
+ <distanceCalculator class="org.apache.alike.EuclideanDistanceCalculator"/>
<fieldNames>
<imageFileFieldName>imgFile</imageFileFieldName>
<queryFieldName>query</queryFieldName>
Modified: labs/alike/trunk/src/java/org/apache/alike/AlikeConfig.java
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/src/java/org/apache/alike/AlikeConfig.java?rev=1426701&r1=1426700&r2=1426701&view=diff
==============================================================================
--- labs/alike/trunk/src/java/org/apache/alike/AlikeConfig.java (original)
+++ labs/alike/trunk/src/java/org/apache/alike/AlikeConfig.java Sat Dec 29
04:16:04 2012
@@ -88,15 +88,15 @@ public final class AlikeConfig {
return getStringValue("/config/clustering/dump/@file");
}
- public String getHistogramMatcherClass(){
- return
getStringValue("/config/vectorQuantization/histogramMatcher/@class");
+ public String getDistanceCalculatorClass(){
+ return
getStringValue("/config/vectorQuantization/distanceCalculator/@class");
}
- public HistogramMatcher getHistogramMatcher(){
+ public DistanceCalculator getDistanceCalculator(){
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
- Class<HistogramMatcher> clazz = (Class<HistogramMatcher>)
classLoader.loadClass(getHistogramMatcherClass());
- Constructor<HistogramMatcher> cnst = clazz.getConstructor();
+ Class<DistanceCalculator> clazz = (Class<DistanceCalculator>)
classLoader.loadClass(getDistanceCalculatorClass());
+ Constructor<DistanceCalculator> cnst = clazz.getConstructor();
return cnst.newInstance();
} catch (Exception e) {
throw new RuntimeException(e);
Modified: labs/alike/trunk/src/java/org/apache/alike/QuantizeVectors.java
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/src/java/org/apache/alike/QuantizeVectors.java?rev=1426701&r1=1426700&r2=1426701&view=diff
==============================================================================
--- labs/alike/trunk/src/java/org/apache/alike/QuantizeVectors.java (original)
+++ labs/alike/trunk/src/java/org/apache/alike/QuantizeVectors.java Sat Dec 29
04:16:04 2012
@@ -64,7 +64,7 @@ public class QuantizeVectors {
// make histograms
HistogramExecutor executor =
- new HistogramExecutor(centroids, config.getHistogramMatcher());
+ new HistogramExecutor(centroids, config.getDistanceCalculator());
FileUtil.executeRecursively(executor, config.getDescNormalFSDir());
Map<String, int[]> histograms = executor.getHistograms();
@@ -125,12 +125,12 @@ public class QuantizeVectors {
private double[][] centroids;
Map<String, int[]> histogramMap;
- private HistogramMatcher histogramMatcher;
+ private DistanceCalculator distanceCalculator;
- public HistogramExecutor(double[][] centroids, HistogramMatcher
histogramMatcher){
+ public HistogramExecutor(double[][] centroids, DistanceCalculator
distanceCalculator){
this.centroids = centroids;
histogramMap = new HashMap<String, int[]>();
- this.histogramMatcher = histogramMatcher;
+ this.distanceCalculator = distanceCalculator;
}
@Override
@@ -169,7 +169,7 @@ public class QuantizeVectors {
double minDistance = Double.MAX_VALUE;
int pos = Integer.MAX_VALUE;
for(int i = 0; i < K; i++){
- double distance = histogramMatcher.computeSimilarity(centroids[i],
desc);
+ double distance = distanceCalculator.compute(centroids[i], desc);
if(minDistance > distance){
minDistance = distance;
pos = i;
Modified: labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java?rev=1426701&r1=1426700&r2=1426701&view=diff
==============================================================================
--- labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java (original)
+++ labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java Sat Dec 29
04:16:04 2012
@@ -89,12 +89,12 @@ public class AlikeConfigTest {
@Test
public void testGetHistogramMatcherClass() throws Exception {
- assertEquals("org.apache.alike.EuclideanDistanceHistogramMatcher",
config.getHistogramMatcherClass());
+ assertEquals("org.apache.alike.EuclideanDistanceCalculator",
config.getDistanceCalculatorClass());
}
@Test
public void testGetHistogramMatcher() throws Exception {
- assertTrue(config.getHistogramMatcher() instanceof
EuclideanDistanceHistogramMatcher);
+ assertTrue(config.getDistanceCalculator() instanceof
EuclideanDistanceCalculator);
}
@Test
Modified: labs/alike/trunk/src/test/test-files/valid-conf.xml
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/src/test/test-files/valid-conf.xml?rev=1426701&r1=1426700&r2=1426701&view=diff
==============================================================================
--- labs/alike/trunk/src/test/test-files/valid-conf.xml (original)
+++ labs/alike/trunk/src/test/test-files/valid-conf.xml Sat Dec 29 04:16:04 2012
@@ -38,7 +38,7 @@
</clustering>
<vectorQuantization>
- <histogramMatcher
class="org.apache.alike.EuclideanDistanceHistogramMatcher"/>
+ <distanceCalculator class="org.apache.alike.EuclideanDistanceCalculator"/>
<fieldNames>
<imageFileFieldName>imgFile</imageFileFieldName>
<queryFieldName>query</queryFieldName>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
