From 3f6434f6dd1c300a624cbab80f597f19ce471904 Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Tue, 16 Aug 2022 18:23:36 -0600 Subject: [PATCH] Remove hard-coded path --- src/wut | 4 ++-- src/wut-compare | 4 ++-- src/wut-compare-all | 2 +- src/wut-compare-tx | 2 +- src/wut-compare-txmode | 2 +- src/wut-compare-txmode-csv | 2 +- src/wut-dl-sort | 2 +- src/wut-dl-sort-tx | 2 +- src/wut-dl-sort-txmode | 2 +- src/wut-dl-sort-txmode-all | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wut b/src/wut index 16240a6..3b37489 100755 --- a/src/wut +++ b/src/wut @@ -16,10 +16,10 @@ OBSID="$1" rm -rf data/test mkdir -p data/test/unvetted -./wut-water $OBSID +wut-water $OBSID [ -f download/$OBSID/waterfall_$OBSID_*.png ] || echo "failed" [ -f download/$OBSID/waterfall_$OBSID_*.png ] || exit cp -p download/$OBSID/waterfall_$OBSID_*.png data/test/unvetted/ -./wut-ml 2>/dev/null | grep -e ^Observation -e "^\[\[" | sed -e 's/\[\[//' -e 's/\]\]//' -e 's/Observation: //g' +wut-ml 2>/dev/null | grep -e ^Observation -e "^\[\[" | sed -e 's/\[\[//' -e 's/\]\]//' -e 's/Observation: //g' diff --git a/src/wut-compare b/src/wut-compare index d008a21..02f4a28 100755 --- a/src/wut-compare +++ b/src/wut-compare @@ -12,12 +12,12 @@ OBSID="$1" # Download observation -./wut-water $OBSID +wut-water $OBSID # Get previous rating VET=`cat download/$OBSID/$OBSID.json | jq --compact-output '.[0] | {vetted_status}' | cut -f 2 -d ":" | sed -e 's/}//g' -e 's/"//g'` echo "Vetted Status: $VET" # Get Machine Learning Result -./wut $OBSID +wut $OBSID diff --git a/src/wut-compare-all b/src/wut-compare-all index 24e3f42..b5255ff 100755 --- a/src/wut-compare-all +++ b/src/wut-compare-all @@ -25,7 +25,7 @@ do echo -n "Vet: $VET " # Get Machine Learning Result - WUT_VET=`./wut $OBSID | cut -f 2 -d " "` + WUT_VET=`wut $OBSID | cut -f 2 -d " "` echo -n "Wut: $WUT_VET " if [ $VET = $WUT_VET ] ; then let CORRECT=$CORRECT+1 diff --git a/src/wut-compare-tx b/src/wut-compare-tx index 2a6eb6f..5264aab 100755 --- a/src/wut-compare-tx +++ b/src/wut-compare-tx @@ -27,7 +27,7 @@ do echo -n "$OBSID " echo -n "Vet: $VET " # Get Machine Learning Result - WUT_VETS=`./wut $OBSID` + WUT_VETS=`wut $OBSID` WUT_VET=`echo $WUT_VETS | cut -f 2 -d " "` WUT_RATE=`echo $WUT_VETS | cut -f 1 -d " "` echo -n "$WUT_VET, " diff --git a/src/wut-compare-txmode b/src/wut-compare-txmode index 7532f5a..3e401f0 100755 --- a/src/wut-compare-txmode +++ b/src/wut-compare-txmode @@ -32,7 +32,7 @@ do echo -n "$OBSID " echo -n "Vet: $VET " # Get Machine Learning Result - WUT_VETS=`./wut $OBSID | cut -f 2 -d " "` + WUT_VETS=`wut $OBSID | cut -f 2 -d " "` WUT_VET=`echo $WUT_VETS | tail -1 | cut -f 2 -d " "` WUT_RATE=`echo $WUT_VETS | head -1` echo -n "Wut: $WUT_VET " diff --git a/src/wut-compare-txmode-csv b/src/wut-compare-txmode-csv index 75d1f60..0f1367a 100755 --- a/src/wut-compare-txmode-csv +++ b/src/wut-compare-txmode-csv @@ -36,7 +36,7 @@ do echo -n "$OBSID, " echo -n "$VET, " # Get Machine Learning Result - WUT_VETS=`./wut $OBSID` + WUT_VETS=`wut $OBSID` WUT_VET=`echo $WUT_VETS | cut -f 2 -d " "` WUT_RATE=`echo $WUT_VETS | cut -f 1 -d " "` echo -n "$WUT_VET, " diff --git a/src/wut-dl-sort b/src/wut-dl-sort index fa36c3e..5e48681 100755 --- a/src/wut-dl-sort +++ b/src/wut-dl-sort @@ -26,7 +26,7 @@ cd /srv/satnogs # Enable the following if you want to download waterfalls in this range: #echo "Downloading Waterfalls" -#./wut-water-range $OBSIDMIN $OBSIDMAX +#wut-water-range $OBSIDMIN $OBSIDMAX # XXX remove data/train and data/val directories XXX echo "Removing data/ subdirectories" diff --git a/src/wut-dl-sort-tx b/src/wut-dl-sort-tx index a5c02a7..b163b3a 100755 --- a/src/wut-dl-sort-tx +++ b/src/wut-dl-sort-tx @@ -29,7 +29,7 @@ OBSID=$OBSIDMIN # Enable the following if you want to download waterfalls in this range: #echo "Downloading Waterfalls" -#./wut-water-range $OBSIDMIN $OBSIDMAX +#wut-water-range $OBSIDMIN $OBSIDMAX # XXX remove data/train and data/val directories XXX echo "Removing data/ subdirectories" diff --git a/src/wut-dl-sort-txmode b/src/wut-dl-sort-txmode index 66e8707..78be040 100755 --- a/src/wut-dl-sort-txmode +++ b/src/wut-dl-sort-txmode @@ -43,7 +43,7 @@ cd $DATADIR || exit # Enable the following if you want to download waterfalls in this range: #echo "Downloading Waterfalls" -#./wut-water-range $OBSIDMIN $OBSIDMAX +#wut-water-range $OBSIDMIN $OBSIDMAX # XXX remove data/train and data/val directories XXX echo "Removing subdirectories" diff --git a/src/wut-dl-sort-txmode-all b/src/wut-dl-sort-txmode-all index 747f51e..86afb72 100755 --- a/src/wut-dl-sort-txmode-all +++ b/src/wut-dl-sort-txmode-all @@ -45,7 +45,7 @@ cd $DATADIR || exit # Enable the following if you want to download waterfalls in this range: #echo "Downloading Waterfalls" -#./wut-water-range $OBSIDMIN $OBSIDMAX +#wut-water-range $OBSIDMIN $OBSIDMAX # XXX remove data/train and data/val directories XXX echo "Removing subdirectories"