You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2017/03/08 17:39:20 UTC
[1/2] climate git commit: CLIMATE-901 - Debugging
calc_histogram_overlap
Repository: climate
Updated Branches:
refs/heads/master 7741c0af6 -> 9557020cf
CLIMATE-901 - Debugging calc_histogram_overlap
- ocw.metrics.calc_histogram_overlap has been updated.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/11458e7c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/11458e7c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/11458e7c
Branch: refs/heads/master
Commit: 11458e7c4b2045166b04fd0ff641b45e581f24ed
Parents: 7741c0a
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:34:18 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:34:18 2017 -0800
----------------------------------------------------------------------
ocw/metrics.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/11458e7c/ocw/metrics.py
----------------------------------------------------------------------
diff --git a/ocw/metrics.py b/ocw/metrics.py
index ecd686c..cd027f0 100644
--- a/ocw/metrics.py
+++ b/ocw/metrics.py
@@ -371,8 +371,8 @@ def calc_histogram_overlap(hist1, hist2):
err = "The two histograms have different sizes"
raise ValueError(err)
overlap = 0.
- for ii in len(hist1_flat):
- overlap = overlap + numpy.min(hist1_flat[ii], hist2_flat[ii])
+ for ii in numpy.arange(len(hist1_flat)):
+ overlap = overlap + numpy.min([hist1_flat[ii], hist2_flat[ii]])
return overlap
[2/2] climate git commit: Merge branch 'CLIMATE-901'
Posted by hu...@apache.org.
Merge branch 'CLIMATE-901'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9557020c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9557020c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9557020c
Branch: refs/heads/master
Commit: 9557020cf7e5fc7335896f900a793a081f8ccbb2
Parents: 7741c0a 11458e7
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:39:07 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:39:07 2017 -0800
----------------------------------------------------------------------
ocw/metrics.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------