Commit 4fc980f0 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Fixed bugs in cnet2dem appTests. References #3869 

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

isis/src/control/apps/cnet2dem/tsts/cnetlist/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ commands: 
	$(APPNAME) cnetlist=$(INPUT)/networks.lis \

	           to=$(OUTPUT)/Equi065S355ED10_dem \

	           map=$(INPUT)/Equi065S355ED10.map \

	  algorithm=FrankeNelsonRadius,ShepardsRadius,AverageRadius,MedianRadius,MinimumRadius,MaximumRadius,StandardDeviationRadius,TypeCount,AverageDistance,MinimumDistance,MaximumDistance,StandardDeviationDistance,MedianDistance,NaturalNeighborRadius > /dev/null;

	           algorithm="FrankeNelsonRadius,ShepardsRadius,AverageRadius,MedianRadius,MinimumRadius,MaximumRadius,StandardDeviationRadius,TypeCount,AverageDistance,MinimumDistance,MaximumDistance,StandardDeviationDistance,MedianDistance,NaturalNeighborRadius" \

	           > /dev/null;

	$(RM) $(INPUT)/networks.lis;

isis/src/control/apps/cnet2dem/tsts/default/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -9,4 +9,7 @@ commands: 
	  to=$(OUTPUT)/truthDemNet \

	  map=$(INPUT)/truthMap.map \

	  search=both \

	  algorithm=FrankeNelsonRadius,ShepardsRadius,AverageRadius,MedianRadius,MinimumRadius,MaximumRadius,StandardDeviationRadius,TypeCount,AverageDistance,MinimumDistance,MaximumDistance,StandardDeviationDistance,MedianDistance,NaturalNeighborRadius \
 
	  algorithm="FrankeNelsonRadius,ShepardsRadius,AverageRadius,MedianRadius,MinimumRadius,MaximumRadius,StandardDeviationRadius,TypeCount,AverageDistance,MinimumDistance,MaximumDistance,StandardDeviationDistance,MedianDistance,NaturalNeighborRadius" \

	  > /dev/null;



	$(RM) $(OUTPUT)/networks.lis;