Author: koji
Date: Sat Dec 29 03:17:57 2012
New Revision: 1426697
URL: http://svn.apache.org/viewvc?rev=1426697&view=rev
Log:
rename a histogram matcher class
Added:
labs/alike/trunk/src/java/org/apache/alike/EuclideanDistanceHistogramMatcher.java
Removed:
labs/alike/trunk/src/java/org/apache/alike/LeastSquaresHistogramMatcher.java
Modified:
labs/alike/trunk/ (props changed)
labs/alike/trunk/demo/demo-conf.xml
labs/alike/trunk/src/test/org/apache/alike/AlikeConfigTest.java
labs/alike/trunk/src/test/test-files/valid-conf.xml
Propchange: labs/alike/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 29 03:17:57 2012
@@ -3,6 +3,7 @@
.settings
target
classes
+job
lib
test-result
test-classes
Modified: labs/alike/trunk/demo/demo-conf.xml
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/demo/demo-conf.xml?rev=1426697&r1=1426696&r2=1426697&view=diff
==============================================================================
--- labs/alike/trunk/demo/demo-conf.xml (original)
+++ labs/alike/trunk/demo/demo-conf.xml Sat Dec 29 03:17:57 2012
@@ -38,7 +38,7 @@
</clustering>
<vectorQuantization>
- <histogramMatcher class="org.apache.alike.LeastSquaresHistogramMatcher"/>
+ <histogramMatcher
class="org.apache.alike.EuclideanDistanceHistogramMatcher"/>
<fieldNames>
<imageFileFieldName>imgFile</imageFileFieldName>
<queryFieldName>query</queryFieldName>
Added:
labs/alike/trunk/src/java/org/apache/alike/EuclideanDistanceHistogramMatcher.java
URL:
http://svn.apache.org/viewvc/labs/alike/trunk/src/java/org/apache/alike/EuclideanDistanceHistogramMatcher.java?rev=1426697&view=auto
==============================================================================
---
labs/alike/trunk/src/java/org/apache/alike/EuclideanDistanceHistogramMatcher.java
(added)
+++
labs/alike/trunk/src/java/org/apache/alike/EuclideanDistanceHistogramMatcher.java
Sat Dec 29 03:17:57 2012
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.alike;
+
+public class EuclideanDistanceHistogramMatcher extends HistogramMatcher {
+
+ public double computeSimilarity(double[] centroid, double[] desc) {
+ int D = centroid.length;
+ double sum = 0;
+ for(int i = 0; i < D; i++){
+ sum += (centroid[i] - desc[i]) * (centroid[i] - desc[i]);
+ }
+ return Math.sqrt(sum);
+ }
+}
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=1426697&r1=1426696&r2=1426697&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
03:17:57 2012
@@ -89,12 +89,12 @@ public class AlikeConfigTest {
@Test
public void testGetHistogramMatcherClass() throws Exception {
- assertEquals("org.apache.alike.LeastSquaresHistogramMatcher",
config.getHistogramMatcherClass());
+ assertEquals("org.apache.alike.EuclideanDistanceHistogramMatcher",
config.getHistogramMatcherClass());
}
@Test
public void testGetHistogramMatcher() throws Exception {
- assertTrue(config.getHistogramMatcher() instanceof
LeastSquaresHistogramMatcher);
+ assertTrue(config.getHistogramMatcher() instanceof
EuclideanDistanceHistogramMatcher);
}
@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=1426697&r1=1426696&r2=1426697&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 03:17:57 2012
@@ -38,7 +38,7 @@
</clustering>
<vectorQuantization>
- <histogramMatcher class="org.apache.alike.LeastSquaresHistogramMatcher"/>
+ <histogramMatcher
class="org.apache.alike.EuclideanDistanceHistogramMatcher"/>
<fieldNames>
<imageFileFieldName>imgFile</imageFileFieldName>
<queryFieldName>query</queryFieldName>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
