Skip to content

Commit

Permalink
fixed wrong reading estimate
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominicrico
dominicrico committed Jul 16, 2015
1 parent fae49c4 commit d0c35a0
Show file tree
Hide file tree
Showing 9 changed files with 336 additions and 110 deletions.
22 changes: 11 additions & 11 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/index.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">All files</span></h1>
<h2>
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"></div>
Expand All @@ -42,23 +42,23 @@ <h2>
</thead>
<tbody><tr>
<td class="file low" data-value="src/"><a href="src/index.html">src/</a></td>
<td data-value="35.87" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
<td data-value="35.87" class="pct low">35.87%</td>
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
<td data-value="22.68" class="pct low">22.68%</td>
<td data-value="97" class="abs low">(22&nbsp;/&nbsp;97)</td>
<td data-value="35.11" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
<td data-value="35.11" class="pct low">35.11%</td>
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
<td data-value="25.29" class="pct low">25.29%</td>
<td data-value="87" class="abs low">(22&nbsp;/&nbsp;87)</td>
<td data-value="50" class="pct medium">50%</td>
<td data-value="16" class="abs medium">(8&nbsp;/&nbsp;16)</td>
<td data-value="35.87" class="pct low">35.87%</td>
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
<td data-value="35.11" class="pct low">35.11%</td>
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
</tr>

</tbody>
</table>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
</div>
<script src="prettify.js"></script>
<script>
Expand Down
22 changes: 11 additions & 11 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/index.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">src/</span></h1>
<h2>
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"><a href="../index.html">All files</a> &#187; src/</div>
Expand All @@ -42,23 +42,23 @@ <h2>
</thead>
<tbody><tr>
<td class="file low" data-value="ng-reading-indicator.js"><a href="ng-reading-indicator.js.html">ng-reading-indicator.js</a></td>
<td data-value="35.87" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
<td data-value="35.87" class="pct low">35.87%</td>
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
<td data-value="22.68" class="pct low">22.68%</td>
<td data-value="97" class="abs low">(22&nbsp;/&nbsp;97)</td>
<td data-value="35.11" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
<td data-value="35.11" class="pct low">35.11%</td>
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
<td data-value="25.29" class="pct low">25.29%</td>
<td data-value="87" class="abs low">(22&nbsp;/&nbsp;87)</td>
<td data-value="50" class="pct medium">50%</td>
<td data-value="16" class="abs medium">(8&nbsp;/&nbsp;16)</td>
<td data-value="35.87" class="pct low">35.87%</td>
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
<td data-value="35.11" class="pct low">35.11%</td>
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
</tr>

</tbody>
</table>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
36 changes: 24 additions & 12 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/ng-reading-indicator.js.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">src/ng-reading-indicator.js</span></h1>
<h2>
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"><a href="../index.html">All files</a> &#187; <a href="index.html">src/</a> &#187; ng-reading-indicator.js</div>
Expand Down Expand Up @@ -225,7 +225,11 @@ <h2>
198
199
200
201</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
201
202
203
204
205</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand Down Expand Up @@ -367,6 +371,9 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
Expand Down Expand Up @@ -398,6 +405,7 @@ <h2>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -545,7 +553,7 @@ <h2>
<span class="cstat-no" title="statement not covered" > bottom = findEdges(article[0]).bottom;</span>
<span class="cstat-no" title="statement not covered" > top = findEdges(article[0]).top;</span>
<span class="cstat-no" title="statement not covered" > height = findEdges(article[0]).height;</span>
<span class="cstat-no" title="statement not covered" > expandOffset = (expandOnHeadline) ? findEdges(article.find('h1')[0]) : {top: 50};</span>
<span class="cstat-no" title="statement not covered" > expandOffset = (expandOnHeadline) ? findEdges(article.find('h1')[0]) : {top: 0};</span>
<span class="cstat-no" title="statement not covered" > updateProgress();</span>
}
&nbsp;
Expand All @@ -567,6 +575,9 @@ <h2>
}
&nbsp;
<span class="cstat-no" title="statement not covered" > progressBar.style.width = progress + '%';</span>
&nbsp;
<span class="cstat-no" title="statement not covered" > console.log(options, expandOffset.top, options.topOffset);</span>
&nbsp;
<span class="cstat-no" title="statement not covered" > if ((!options.expand &amp;&amp; options.type === 'small' &amp;&amp; scrollPos &gt;= (top + expandOffset.top + options.topOffset)) || (options.expand &amp;&amp; scrollPos &gt; top &amp;&amp; scrollPos &lt; (top + expandOffset.top + options.topOffset))) {</span>
<span class="cstat-no" title="statement not covered" > angular.element(element)[0].style.height = '5px';</span>
<span class="cstat-no" title="statement not covered" > angular.element(element).addClass('ng-reading-indicator-shrink');</span>
Expand All @@ -583,20 +594,21 @@ <h2>
}
&nbsp;
<span class="fstat-no" title="function not covered" > function calculateReadingTime(){</span>
<span class="cstat-no" title="statement not covered" > var wordCount = article.text().split(' ').length;</span>
<span class="cstat-no" title="statement not covered" > var wordCount = angular.element(article[0]).text().trim().split(' ').length;</span>
<span class="cstat-no" title="statement not covered" > var minutes = Math.floor(wordCount / options.readingTime.speed);</span>
<span class="cstat-no" title="statement not covered" > var seconds = Math.floor(wordCount % options.readingTime.speed / (options.readingTime.speed / 60));</span>
<span class="cstat-no" title="statement not covered" > var estimate = options.readingTime.prefix;</span>
&nbsp;
<span class="cstat-no" title="statement not covered" > if (!options.readingTime.seconds &amp;&amp; seconds &gt;= 30) {</span>
<span class="cstat-no" title="statement not covered" > if (seconds &gt;= 30) {</span>
<span class="cstat-no" title="statement not covered" > minutes++;</span>
}
&nbsp;
<span class="cstat-no" title="statement not covered" > if (Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100))) &gt; 0 || !options.readingTime.seconds) {</span>
<span class="cstat-no" title="statement not covered" > estimate += Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100)));</span>
<span class="cstat-no" title="statement not covered" > if (Math.floor(minutes * (1 - (progress/100))) &gt; 0 || !options.readingTime.seconds) {</span>
<span class="cstat-no" title="statement not covered" > minutes = minutes * (1 - (progress/100));</span>
<span class="cstat-no" title="statement not covered" > estimate += Math.floor(minutes);</span>
<span class="cstat-no" title="statement not covered" > estimate += options.readingTime.minutesSuffix;</span>
} else <span class="cstat-no" title="statement not covered" >if (Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100))) === 0 &amp;&amp; options.readingTime.seconds) {</span>
<span class="cstat-no" title="statement not covered" > estimate += Math.round((((minutes &lt;= 9 ? minutes + '0' : minutes)*60) * (1 - (progress/100))) / 10) * options.readingTime.secondInterval;</span>
} else <span class="cstat-no" title="statement not covered" >if (Math.floor(minutes * (1 - (progress/100))) === 0 &amp;&amp; options.readingTime.seconds) {</span>
<span class="cstat-no" title="statement not covered" > estimate += Math.round((((minutes)*60) * (1 - (progress/100))) / 10) * options.readingTime.secondInterval;</span>
<span class="cstat-no" title="statement not covered" > estimate += options.readingTime.secondsSuffix;</span>
} else {
<span class="cstat-no" title="statement not covered" > estimate += 0 + options.readingTime.secondsSuffix;</span>
Expand Down Expand Up @@ -630,7 +642,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
120 changes: 56 additions & 64 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov.info
View file
Expand Up @@ -13,9 +13,9 @@ FN:106,findEdges
FN:117,updateSize
FN:125,updateProgress
FN:135,(anonymous_13)
FN:158,calculateReadingTime
FN:182,(anonymous_15)
FN:191,(anonymous_16)
FN:161,calculateReadingTime
FN:186,(anonymous_15)
FN:195,(anonymous_16)
FNF:16
FNH:8
FNDA:1,(anonymous_1)
Expand Down Expand Up @@ -92,41 +92,43 @@ DA:135,0
DA:136,0
DA:139,0
DA:142,0
DA:143,0
DA:144,0
DA:145,0
DA:146,0
DA:147,0
DA:148,0
DA:149,0
DA:150,0
DA:151,0
DA:152,0
DA:153,0
DA:154,0
DA:158,1
DA:159,0
DA:160,0
DA:161,0
DA:155,0
DA:156,0
DA:157,0
DA:161,1
DA:162,0
DA:163,0
DA:164,0
DA:165,0
DA:167,0
DA:168,0
DA:169,0
DA:170,0
DA:171,0
DA:172,0
DA:173,0
DA:174,0
DA:175,0
DA:178,0
DA:181,4
DA:176,0
DA:177,0
DA:179,0
DA:182,0
DA:183,0
DA:184,0
DA:188,4
DA:191,4
DA:192,0
DA:193,0
LF:92
DA:185,4
DA:186,0
DA:187,0
DA:188,0
DA:192,4
DA:195,4
DA:196,0
DA:197,0
LF:94
LH:33
BRDA:25,1,0,4
BRDA:25,1,1,4
Expand Down Expand Up @@ -183,48 +185,38 @@ BRDA:131,25,0,0
BRDA:131,25,1,0
BRDA:134,26,0,0
BRDA:134,26,1,0
BRDA:143,27,0,0
BRDA:143,27,1,0
BRDA:143,28,0,0
BRDA:143,28,1,0
BRDA:143,28,2,0
BRDA:143,28,3,0
BRDA:143,28,4,0
BRDA:143,28,5,0
BRDA:147,29,0,0
BRDA:147,29,1,0
BRDA:147,30,0,0
BRDA:147,30,1,0
BRDA:147,30,2,0
BRDA:147,30,3,0
BRDA:164,31,0,0
BRDA:164,31,1,0
BRDA:164,32,0,0
BRDA:164,32,1,0
BRDA:168,33,0,0
BRDA:168,33,1,0
BRDA:168,34,0,0
BRDA:168,34,1,0
BRDA:168,35,0,0
BRDA:168,35,1,0
BRDA:169,36,0,0
BRDA:169,36,1,0
BRDA:171,37,0,0
BRDA:171,37,1,0
BRDA:171,38,0,0
BRDA:171,38,1,0
BRDA:171,39,0,0
BRDA:171,39,1,0
BRDA:172,40,0,0
BRDA:172,40,1,0
BRDA:181,41,0,0
BRDA:181,41,1,4
BRDA:181,42,0,4
BRDA:181,42,1,0
BRDA:183,43,0,0
BRDA:183,43,1,0
BRDA:183,44,0,0
BRDA:183,44,1,0
BRF:97
BRDA:146,27,0,0
BRDA:146,27,1,0
BRDA:146,28,0,0
BRDA:146,28,1,0
BRDA:146,28,2,0
BRDA:146,28,3,0
BRDA:146,28,4,0
BRDA:146,28,5,0
BRDA:150,29,0,0
BRDA:150,29,1,0
BRDA:150,30,0,0
BRDA:150,30,1,0
BRDA:150,30,2,0
BRDA:150,30,3,0
BRDA:167,31,0,0
BRDA:167,31,1,0
BRDA:171,32,0,0
BRDA:171,32,1,0
BRDA:171,33,0,0
BRDA:171,33,1,0
BRDA:175,34,0,0
BRDA:175,34,1,0
BRDA:175,35,0,0
BRDA:175,35,1,0
BRDA:185,36,0,0
BRDA:185,36,1,4
BRDA:185,37,0,4
BRDA:185,37,1,0
BRDA:187,38,0,0
BRDA:187,38,1,0
BRDA:187,39,0,0
BRDA:187,39,1,0
BRF:87
BRH:22
end_of_record

0 comments on commit d0c35a0

Please sign in to comment.