Skip to content

Commit

Permalink
Merge pull request #23 from AgPipeline/develop
Browse files Browse the repository at this point in the history
Merging develop to main branch - no review
  • Loading branch information
Chris-Schnaufer authored Jan 12, 2021
2 parents 4957544 + e6d3f5a commit 238e143
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_test_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ BEGIN {
}
{
if ($1 != "species") { # Skipping the header line
printf("(%s %s %s %s %s %s %s %s %s %s %s)\n", $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)
printf("(%s %s %s %s %s %s %s %s %s %s %s)\n", $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)
}
}
END {
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/testing_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ jobs:
run: python3 -m pip install --upgrade --no-cache-dir pip
- name: Fetch/update setuptools
run: python3 -m pip install --upgrade --no-cache-dir setuptools
- name: Install python-apt
run: sudo apt-get install -y python-apt
- name: HACK to fix apt-get update problem w/ different python versions
run: 'cd /usr/lib/python3/dist-packages && sudo cp apt_pkg.cpython-36m-x86_64-linux-gnu.so apt_pkg.so'
- name: Update apt-get
run: sudo apt-get update
- name: Fetch/update testing pip installations
run: python3 -m pip install --upgrade --no-cache-dir ${{ matrix.pip_installs }}
- name: Fetch source code
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[![license](https://img.shields.io/badge/license-BSD%203-green?logo=Open-Source-Initiative)](https://github.com/AgPipeline/transformer-rgb-indices/blob/master/LICENSE)

[![Enforcing testing](https://github.com/AgPipeline/transformer-rgb-indices/workflows/Enforcing%20tests/badge.svg)](https://github.com/AgPipeline/transformer-rgb-indices/actions?query=workflow%3A%22Enforcing+tests%22)
[![testing](https://github.com/AgPipeline/transformer-rgb-indices/workflows/Testing%20Docker%20image/badge.svg)](https://github.com/AgPipeline/transformer-rgb-indices/actions?query=workflow%3A%22Testing+Docker+image%22)

# Greenness Indices

This algorithm computes a series of indices from RGB cameras. These can be used to assess crop and plant
Expand Down
2 changes: 1 addition & 1 deletion test_data/rgb_plot.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
species,site,timestamp,lat,lon,citation_author,citation_year,citation_title,excess greenness index excess_greenness_index ([-510:510]), green leaf index green_leaf_index ( [-1:1]), cive cive ( [-255:255]), normalized difference index normalized_difference_index(pxarray) ( [-127:129]), excess red excess_red ( [-255:255]), exgr exgr ( [-255:332]), combined indices 1 combined_indices_1 ( [-1000:1000]), combined indices 2 combined_indices_2 ( [-1000:1000]), vegetative index vegetative_index ( [-255:255]), normalized green-red difference ngrdi ( [-255:255]), percent green percent_green ( [0:100])
Sorghum bicolor,,2018-10-11,33.07454704500288,-111.97502671168861,"Clairessa Brown","2020","Woebbecke, D.M. et al",14.0,0.02,16.16,-1.53,56.53,-42.53,30.16,12.81,1.02,-0.02,0.34
Sorghum bicolor,,2018-10-11,33.07454704500288,-111.97502671168861,"Clairessa Brown","2020","Woebbecke, D.M. et al",14,0.02,16.2,-1.53,56.5,-42.5,30.2,12.8,1.02,-0.02,0.34

0 comments on commit 238e143

Please sign in to comment.