diff --git a/wut b/wut index a2b6782..dcd5e92 100755 --- a/wut +++ b/wut @@ -19,5 +19,5 @@ mkdir -p data/test/unvetted [ -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 ^Observation | sed -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/wut-compare-txmode b/wut-compare-txmode index 7f07543..7532f5a 100755 --- a/wut-compare-txmode +++ b/wut-compare-txmode @@ -32,9 +32,12 @@ do echo -n "$OBSID " echo -n "Vet: $VET " # Get Machine Learning Result - WUT_VET=`./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 " - if [ $VET = $WUT_VET ] ; then + echo -n "Rate: $WUT_RATE " + if [ "$VET" = "$WUT_VET" ] ; then let CORRECT=$CORRECT+1 else let INCORRECT=$INCORRECT+1