Author: tommaso
Date: Thu Jun 8 15:51:19 2017
New Revision: 1798084
URL: http://svn.apache.org/viewvc?rev=1798084&view=rev
Log:
OAK-6317 - fixed LMSEstimator update rule (branch 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 8 15:51:19 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774
497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746634,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287
,1750457,1750462,1750465,1750495,1750626,1750809,1750886-1750887,1751396,1751410,1751419,1751445-1751446,1751478,1751748,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756505-1756506,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1759754,1759795,1759826,1760326,1760340,1760373,1760387,1760486,1760492,1760494,1760661-1760662,1760677,1760701,1760709,1760946,1761412,1761444,1761571,1761762,1761787,1761866,1761876,1762453,1762612,1762632,1762635,1762825,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766390,1766423,1766496,1766519,1766554,1766644,1767025,1767265,1767502,1767704,1768446,1768637,1769078,1769939-1769940,1770694,1770982,1771022,1771093,1771098,1771739,1771852,1771870,1771902,1772155,1772162,1772228,1772593,1772768,1773190,1774
497,1774787,1775474,1775622,1775628,1775757,1778112,1778423,1778968,1779137,1779478,1780388,1780424,1780538,1780543,1781068,1781075,1781386,1781846,1781907,1782476,1782966,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783738,1783773,1783855,1783891,1784023,1784034,1784130,1784251,1784551,1784574,1784689,1785283,1785946,1787074,1787217,1787425,1789056,1792463,1792742,1793088,1793644,1795314,1795330,1795475,1795488,1795491,1795613,1795618,1796144,1798035
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java?rev=1798084&r1=1798083&r2=1798084&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimator.java
Thu Jun 8 15:51:19 2017
@@ -22,11 +22,13 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.solr.common.SolrDocumentList;
/**
- * A very simple estimator for no. of entries in the index using least mean
square update method but not the full stochastic
- * gradient descent algorithm (yet?), on a linear interpolation model.
+ * A very simple estimator for no. of entries in the index using least mean
square update method for linear regression.
*/
class LMSEstimator {
+ private static final double DEFAULT_ALPHA = 0.03;
+ private static final int DEFAULT_THRESHOLD = 5;
+
private double[] weights;
private final double alpha;
private final long threshold;
@@ -38,23 +40,25 @@ class LMSEstimator {
}
LMSEstimator(double[] weights) {
- this(0.03, weights, 5);
+ this(DEFAULT_ALPHA, weights, DEFAULT_THRESHOLD);
}
LMSEstimator() {
- this(0.03, new double[5], 5);
+ this(DEFAULT_ALPHA, new double[5], 5);
}
synchronized void update(Filter filter, SolrDocumentList docs) {
double[] updatedWeights = new double[weights.length];
+
+ // least mean square cost
long estimate = estimate(filter);
long numFound = docs.getNumFound();
- long diff = numFound - estimate;
- double delta = Math.pow(diff, 2) / 2;
+ long residual = numFound - estimate;
+ double delta = Math.pow(residual, 2);
+
if (Math.abs(delta) > threshold) {
for (int i = 0; i < updatedWeights.length; i++) {
- double errors = delta * getInput(filter, i);
- updatedWeights[i] = weights[i] + (diff > 0 ? 1 : -1) * alpha *
errors;
+ updatedWeights[i] = weights[i] + alpha * residual *
getInput(filter, i);
}
// weights updated
weights = Arrays.copyOf(updatedWeights, 5);
Modified:
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java?rev=1798084&r1=1798083&r2=1798084&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/LMSEstimatorTest.java
Thu Jun 8 15:51:19 2017
@@ -53,18 +53,22 @@ public class LMSEstimatorTest {
docs.setNumFound(actualCount);
long estimate = lmsEstimator.estimate(filter);
+ assertEquals(estimate, lmsEstimator.estimate(filter));
long diff = actualCount - estimate;
// update causes weights adjustment
lmsEstimator.update(filter, docs);
long estimate2 = lmsEstimator.estimate(filter);
+ assertEquals(estimate2, lmsEstimator.estimate(filter));
long diff2 = actualCount - estimate2;
assertTrue(diff2 < diff); // new estimate is more accurate than
previous one
// update doesn't cause weight adjustments therefore estimates stays
unchanged
lmsEstimator.update(filter, docs);
long estimate3 = lmsEstimator.estimate(filter);
- assertEquals(estimate3, estimate2);
+ assertEquals(estimate3, lmsEstimator.estimate(filter));
+ long diff3 = actualCount - estimate3;
+ assertTrue(diff3 < diff2);
}
@Test
