From d9d8cc22899474616b65d01381b21a02fa261e52 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Wed, 23 Dec 2020 14:06:11 -0700 Subject: [PATCH 1/4] Added badges --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 7289af2..c6ee933 100644 --- a/README.md +++ b/README.md @@ -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 From 2c0d00bb781a001782d47ddb728d4c61e292a1ea Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 12 Jan 2021 13:31:12 -0700 Subject: [PATCH 2/4] Updating Action and removed puthon-apt --- .github/workflows/testing_checks.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/testing_checks.yaml b/.github/workflows/testing_checks.yaml index ec5ffe1..7a8e42f 100644 --- a/.github/workflows/testing_checks.yaml +++ b/.github/workflows/testing_checks.yaml @@ -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 From b433d86e02a982b13ed07fc8e444a8e10bc75d97 Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 12 Jan 2021 15:19:27 -0700 Subject: [PATCH 3/4] Working on Action errors --- .github/workflows/docker_test_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_test_check.sh b/.github/workflows/docker_test_check.sh index 8028cd9..7ee279b 100755 --- a/.github/workflows/docker_test_check.sh +++ b/.github/workflows/docker_test_check.sh @@ -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 { From da1f106a8178c24fb670b606030b26a744671c9a Mon Sep 17 00:00:00 2001 From: Chris Schnaufer Date: Tue, 12 Jan 2021 15:28:41 -0700 Subject: [PATCH 4/4] Update test data --- test_data/rgb_plot.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_data/rgb_plot.csv b/test_data/rgb_plot.csv index 01f6af1..588ca1f 100644 --- a/test_data/rgb_plot.csv +++ b/test_data/rgb_plot.csv @@ -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