Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #258

Merged
merged 283 commits into from
May 11, 2020
Merged

Develop #258

merged 283 commits into from
May 11, 2020

Conversation

nbarlowATI
Copy link
Member

Merge working "pre-pipeline" version of pyveg into master.

crangelsmith and others added 30 commits April 8, 2020 14:06
@crangelsmith
function to remove seasonality (#178)
8a04d9a
@crangelsmith
adapting plotting script to add a suffix in the file name (#178)
dd7bc08
@samvanstroud
fix tests
d3340fb
@nbarlowATI
Merge pull request #177 from alan-turing-institute/161-improve-qualit…
e918770 
…y-control

#161 Improve Quality Control
@crangelsmith
removing nans after resampling in remove seasonality function (#178)
51ab19e
@crangelsmith
adding unseasonal analysis (#178)
c8639a7
@samvanstroud
improve clarity
ff22128
@samvanstroud
fix outlier detection
206db60
@crangelsmith
Merge pull request #189 from alan-turing-institute/188-squash-analysi…
8c16252 
…s-bugs

#188 squash analysis bugs
@crangelsmith
modifying seasonality function to run in each subimage (#178)
85002cc
@crangelsmith
Merge remote-tracking branch 'origin/develop' into feature/178-remove…
7920b35 
…-seasonality

# Conflicts:
#	pyveg/src/data_analysis_utils.py
@crangelsmith
adapting plotting for a dynamic axis (#178)
7fcec9b
@crangelsmith
adding suffix to the write csv function and tidy up the remove season…
6c2ee42 
… plot (#178)
@crangelsmith
dynamic plotting axis (#178)
98dd6e6
@nbarlowATI
WIP first attemp at modularizing vegetation analysis
f871a1e
@nbarlowATI
start subgraph centrality module
b6a2362
@nbarlowATI
extra protection against bad images that could crash check_image_ok
be12f12
@nbarlowATI
check for bad big images
28d074e
@samvanstroud
decrease default smoothing level
de04594 
based on the performance on new results
@samvanstroud
fix bug due to new output json format
dfad68e
@samvanstroud
fix var name and increase y axis range
454f55b
@samvanstroud
improve output while downloading
5078fbd
@samvanstroud
fix tests
86e51ed
@nbarlowATI
WIP more progress towards analysis sequences
254eb34
@nbarlowATI
move some stuff to file_utils
ed6d023
@crangelsmith
adding unseasonal analysis for summary time series as well (#178)
3b3accd
@crangelsmith
adding unseasonal analysis in the summary ts (#178)
825abca
@nbarlowATI
WIP start to add json combiner
41a53f5
@nbarlowATI
Merge pull request #190 from alan-turing-institute/188-fix-more-bugs
37b3f4d 
Fix a few bugs
@crangelsmith
Merge branch 'develop' into feature/178-remove-seasonality
6eb2797
nbarlowATI and others added 29 commits May 2, 2020 17:56
@nbarlowATI
remove png files produced in test
a59d16d
@nbarlowATI
test tif images
ae6dc04
@crangelsmith
moving default smoothing back to n=4, to avoid overfitting which brea…
aaebc45 
…ks the analysis (#237)
@nbarlowATI
WIP tests for processor modules
75316b4
@samvanstroud
fix landsat string parsing
15d0603
@samvanstroud
don't resample by default
83f4fd2
@samvanstroud
adaptive y lim in plot
b9d5977
@samvanstroud
modify plot lim
49b425a
@samvanstroud
better frequency support
8fc7bd2
@nbarlowATI
Merge pull request #242 from alan-turing-institute/bugfix/landsat5-su…
7f658c8 
…pport

Bugfix/landsat5 support
@nbarlowATI
Merge branch 'develop' into feature/237-alternative-smoothing
3013194
@crangelsmith
Merge pull request #239 from alan-turing-institute/feature/237-altern…
ee8bc1e 
…ative-smoothing

Feature/237 alternative smoothing
@samvanstroud
timestamp output dir
44e6d01
@samvanstroud
check do_network_centrality flag
49b2386
@samvanstroud
split and save NDVI image
25f4fde
@samvanstroud
calculate mean and std of ndvi veg pixels
1217dd1
@samvanstroud
round values
a74c1e1
@samvanstroud
Merge branch 'feature/139-pipeline-tests' of github.com:alan-turing-i…
5fbc53e 
…nstitute/monitoring-ecosystem-resilience into feature/139-pipeline-tests
@samvanstroud
process in date order
0524863
@samvanstroud
cache config file
f42199a
@nbarlowATI
move Sentinel2 test images into subdir
efb6d76
@nbarlowATI
add ERA5 test tif files
fb4ed82
@nbarlowATI
move ERA5 test tif files into subdir
9b8c3bd
@nbarlowATI
add test for weather image processor
8a5165e
@nbarlowATI
don't add combiner sequence if only one other sequence
af6ce57
@samvanstroud
store ndvi for entire image
6978317 
(ignoring veg thesholding)
@nbarlowATI
Merge pull request #238 from alan-turing-institute/feature/139-pipeli…
a3dfb5a 
…ne-tests

WIP Feature/139 pipeline tests
@nbarlowATI
Revert "WIP Feature/139 pipeline tests"
6227426
@nbarlowATI
Merge pull request #257 from alan-turing-institute/revert-238-feature…
eb7de4b 
…/139-pipeline-tests

Revert "WIP Feature/139 pipeline tests"
@nbarlowATI nbarlowATI merged commit e77e314 into master May 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nbarlowATI @crangelsmith @samvanstroud