Commit a8eace3c authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Fixed issue with macs having slightly different iteration values in... 

PROG: Fixed issue with macs having slightly different iteration values in jigsaw observation mode tests (case01, observation_mode_cholmod). Fixed tolerance value for RMS (from 2e-11 to 3e-11) for jigsaw apollo test. References #4072.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6894 41f8697f-d340-4b68-9986-7bafba869bb8
parent b7a907d2

isis/src/control/apps/jigsaw/tsts/case01/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ APPNAME = jigsaw 
# 2. remove net filename paths

# 3. remove digits beyond the fifth decimal place of decimal numbers

# 4. remove date and time

# 5. remove the number of iterations that occurred



include $(ISISROOT)/make/isismake.tsts
@@ -26,14 +27,15 @@ commands: 
	twist=no > /dev/null;

	cat t_bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  | sed 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	  | sed s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	  | $(SED) 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	  | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	  | $(SED) 's/\(Iterations:\).*/\1/' \

	  > $(OUTPUT)/bundleout.txt

	cat t_residuals.csv | sed 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\

	  > $(OUTPUT)/residuals.csv

	cat t_bundleout_images.csv \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  | sed 's/\([0-9]*\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)\([0-9]*\)/\1/g' \

	  | $(SED) 's/\([0-9]*\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\)\([0-9]*\)/\1/g' \

	  > $(OUTPUT)/bundleout_images.csv

	$(RM) t_bundleout_images.csv > /dev/null;

	$(MV) t_bundleout_points.csv $(OUTPUT)/bundleout_points.csv > /dev/null;

isis/src/control/apps/jigsaw/tsts/observation_mode_cholmod/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ commands: 
	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	  | sed 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	  | sed s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	  | $(SED) 's/\(Iterations:\).*/\1/' \

	  > $(OUTPUT)/obsmode_cholmod_bundleout.txt

	# The above command uses sed to do the following (in order):

	# 1. remove cube filename paths

	# 2. remove net filename paths

	# 3. remove digits beyond the fifth decimal place of decimal numbers

	# 4. remove date and time

	# 5. remove number of iterations

	cat residuals.csv | sed 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\

	  > $(OUTPUT)/obsmode_cholmod_residuals.csv

	cat bundleout_images.csv | sed 's/\/[^,]*\/\([^,\/]*\.cub\)/\1/g' \