Commit fb39a36d authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated from trunk. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6940 41f8697f-d340-4b68-9986-7bafba869bb8
parent f05cc06d

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

+37 −37
Original line number Diff line number Diff line
@@ -41,15 +41,15 @@ commands: 
#	           spsolve=position \

#	           spacecraft_position_sigma=1000.0 \

#	           camera_angles_sigma=2.0 > /dev/null;

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

#	$(CAT) 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]*\)/\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]*\)/\1/g' \

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

#	       > $(OUTPUT)/apollo_specialK_bundleout.txt;

#	cat residuals.csv \

#	$(CAT) residuals.csv \

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

#	       > $(OUTPUT)/apollo_specialK_residuals.csv;

#	cat bundleout_images.csv \

#	$(CAT) bundleout_images.csv \

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

#	       > $(OUTPUT)/apollo_specialK_bundleout_images.csv;

#	$(RM) bundleout_images.csv > /dev/null;
@@ -64,17 +64,17 @@ commands: 
	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           camera_angles_sigma=2.0 > /dev/null;

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

	$(CAT) 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]*\)/\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]*\)/\1/g' \

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

	       > $(OUTPUT)/apollo_cholmod_bundleout.txt;

	cat residuals.csv \

	$(CAT) residuals.csv \

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

	       > $(OUTPUT)/apollo_cholmod_residuals.csv;

#	cat bundleout_images.csv \

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

#	  > $(OUTPUT)/apollo_cholmod_bundleout_images.csv;

	$(CAT) bundleout_images.csv \

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

	       > $(OUTPUT)/apollo_cholmod_bundleout_images.csv;

#	$(RM) bundleout_images.csv > /dev/null;

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

	$(RM) bundleout.txt print.prt > /dev/null;

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

+18 −18
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ commands: 
	       | $(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'\

	$(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/case2/Makefile

+18 −18
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@ commands: 
	           sigma0=1.e-5  \

	           maxits=10 \

	           spsolve=position > /dev/null;

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

	$(CAT) 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]\)\([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]\)\([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/ \

	       > $(OUTPUT)/bundleout.txt

	cat residuals.csv \

	$(CAT) residuals.csv \

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

	       > $(OUTPUT)/residuals.csv

#	cat bundleout_images.csv \

#	$(CAT) bundleout_images.csv \

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

#	       > $(OUTPUT)/bundleout_images.csv

#	$(RM) bundleout_images.csv > /dev/null;

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

+21 −21
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ commands: 
	           sigma0=1.e-3  \

	           maxits=150 \

	           spsolve=position > /dev/null;

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

	$(CAT) 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/ \

	       > $(OUTPUT)/mEstimator_bundleout.txt;

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

	$(CAT) residuals.csv | $(SED) 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\

	       > $(OUTPUT)/mEstimator_residuals.csv

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

#	$(CAT) bundleout_images.csv | $(SED) 's/\/[^,]*\/\([^,\/]*\.cub\)/\1/g' \

#	       | 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)/mEstimator_bundleout_images.csv

#	$(RM) bundleout_images.csv > /dev/null;

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

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

+17 −17
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ commands: 
	           cksolvedegree=3 \

	           camsolve=all \

	           twist=no > /dev/null;

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

	$(CAT) 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)/obsmode_cholmod_bundleout.txt

	# The above command uses sed to do the following (in order):
@@ -28,9 +28,9 @@ commands: 
	# 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'\

	$(CAT) residuals.csv | $(SED) 's/,[^,]*\/\([^,\/]*\.cub\)/,\1/g'\

	       > $(OUTPUT)/obsmode_cholmod_residuals.csv

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

#	$(CAT) bundleout_images.csv | $(SED) 's/\/[^,]*\/\([^,\/]*\.cub\)/\1/g' \

#	       > $(OUTPUT)/obsmode_cholmod_bundleout_images.csv

#	$(RM) bundleout_images.csv > /dev/null;

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