You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@climate.apache.org by kwhitehall <gi...@git.apache.org> on 2015/02/26 04:57:51 UTC
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
GitHub user kwhitehall opened a pull request:
https://github.com/apache/climate/pull/155
CLIMATE - 592 update functions in dataset_processor.py to accommodate units
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/kwhitehall/climate CLIMATE-592
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/climate/pull/155.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #155
----
commit 7049d3893f8748691e9d3c289ad722c3dda757d9
Author: Kim Whitehall <k_...@yahoo.com>
Date: 2015-02-23T13:06:54Z
CLIMATE585 Fixed the bias calcuation in Bias, TemporalMeanBias, and SpatialMeanOfTemporalMeanBias
commit 8341e5f4ffe513f4d2ce28a96910e41995f5d840
Author: Kim Whitehall <k_...@yahoo.com>
Date: 2015-02-26T01:37:02Z
added units instance attribute to class Dataset & updated functions accordingly
commit c6b9ff8a79263afe5a54c44d252266eb92eab6a3
Author: Kim Whitehall <k_...@yahoo.com>
Date: 2015-02-26T01:47:59Z
update data_source/local.py to store units from datasets
commit c5c598d4188ef6221c5b0705c86c86ddb9404e92
Author: Kim Whitehall <k_...@yahoo.com>
Date: 2015-02-26T01:51:00Z
CLIMATE-591 - update data_source/rcmed.py to store units from the database
commit b4f38ef6b74d50a8027bf067fed49c130b8f892c
Author: Kim Whitehall <k_...@yahoo.com>
Date: 2015-02-26T01:54:00Z
CLIMATE-592 - update dataset_processor.py to accommodate units in Dataset object
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by kwhitehall <gi...@git.apache.org>.
Github user kwhitehall commented on the pull request:
https://github.com/apache/climate/pull/155#issuecomment-76463823
Thanks for the feedback Michael.
Looks like I committed away on one branch after all. Any direction on how to rectify this mismatch up of issues and PR?
Regarding the failures, I understand the failed tests in test.metrics as the calculations in metrics.py that have a metrics bias calculation in them were changed from ref_dataset - target_dataset to target_dataset - ref_dataset
Still investigating the test_dataset_processor failures.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by kwhitehall <gi...@git.apache.org>.
Github user kwhitehall closed the pull request at:
https://github.com/apache/climate/pull/155
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by OCWJenkins <gi...@git.apache.org>.
Github user OCWJenkins commented on the pull request:
https://github.com/apache/climate/pull/155#issuecomment-76118577
Merged build finished. Test Failed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by OCWJenkins <gi...@git.apache.org>.
Github user OCWJenkins commented on the pull request:
https://github.com/apache/climate/pull/155#issuecomment-76118502
Merged build triggered. Test Failed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by OCWJenkins <gi...@git.apache.org>.
Github user OCWJenkins commented on the pull request:
https://github.com/apache/climate/pull/155#issuecomment-76118509
Merged build started. Test Failed.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] climate pull request: CLIMATE - 592 update functions in dataset_pr...
Posted by MJJoyce <gi...@git.apache.org>.
Github user MJJoyce commented on the pull request:
https://github.com/apache/climate/pull/155#issuecomment-76272695
Hey Kim. Two things that catch my eye immediately. First, looks like these changes broke tests (see below). Second, it looks like you have a number of commits all smash into a single pull request here. Did you perhaps commit before branching and end up with all the commits in all your pull requests?
Note, this applies to all the pull requests you made.
```
+ nosetests
..............................................F........F....................F.......F..........................
======================================================================
FAIL: test_variable_propagation (ocw.tests.test_dataset_processor.TestSpatialRegrid)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/ocw/tests/test_dataset_processor.py", line 154, in test_variable_propagation
self.assertEquals(self.input_dataset.name, self.regridded_dataset.name)
AssertionError: 'foo' != ''
======================================================================
FAIL: test_variable_propagation (ocw.tests.test_dataset_processor.TestTemporalRebin)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/ocw/tests/test_dataset_processor.py", line 102, in test_variable_propagation
self.ten_year_monthly_dataset.name)
AssertionError: '' != 'foo'
======================================================================
FAIL: Test bias function between reference dataset and target dataset.
----------------------------------------------------------------------
Traceback (most recent call last):
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/ocw/tests/test_metrics.py", line 57, in test_function_run
np.testing.assert_array_equal(self.bias.run(self.reference_dataset, self.target_dataset), expected_result)
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/OCWVE/lib/python2.7/site-packages/numpy/testing/utils.py", line 718, in assert_array_equal
verbose=verbose, header='Arrays are not equal')
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/OCWVE/lib/python2.7/site-packages/numpy/testing/utils.py", line 644, in assert_array_compare
raise AssertionError(msg)
AssertionError:
Arrays are not equal
(mismatch 100.0%)
x: array([[[300, 300, 300, 300, 300],
[300, 300, 300, 300, 300],
[300, 300, 300, 300, 300],...
y: array([[[-300, -300, -300, -300, -300],
[-300, -300, -300, -300, -300],
[-300, -300, -300, -300, -300],...
======================================================================
FAIL: Test mean bias function between reference dataset and target dataset.
----------------------------------------------------------------------
Traceback (most recent call last):
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/ocw/tests/test_metrics.py", line 209, in test_function_run
np.testing.assert_array_equal(self.mean_bias.run(self.reference_dataset, self.target_dataset), expected_result)
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/OCWVE/lib/python2.7/site-packages/numpy/testing/utils.py", line 718, in assert_array_equal
verbose=verbose, header='Arrays are not equal')
File "/var/lib/jenkins/jobs/OCWPRBuild/workspace/OCWVE/lib/python2.7/site-packages/numpy/testing/utils.py", line 644, in assert_array_compare
raise AssertionError(msg)
AssertionError:
Arrays are not equal
(mismatch 100.0%)
x: array([[ 300., 300., 300., 300., 300.],
[ 300., 300., 300., 300., 300.],
[ 300., 300., 300., 300., 300.],...
y: array([[-300, -300, -300, -300, -300],
[-300, -300, -300, -300, -300],
[-300, -300, -300, -300, -300],...
----------------------------------------------------------------------
Ran 111 tests in 37.179s
FAILED (failures=4)
Build step 'Execute shell' marked build as failure
Finished: FAILURE
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---