Revision: 53454
http://brlcad.svn.sourceforge.net/brlcad/?rev=53454&view=rev
Author: brlcad
Date: 2012-11-05 18:12:43 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
get rid of the two diagnosis types and just print both. eliminate the
interactive input code.
Modified Paths:
--------------
brlcad/trunk/src/libbu/tests/bu_redblack.c
Modified: brlcad/trunk/src/libbu/tests/bu_redblack.c
===================================================================
--- brlcad/trunk/src/libbu/tests/bu_redblack.c 2012-11-05 17:59:35 UTC (rev
53453)
+++ brlcad/trunk/src/libbu/tests/bu_redblack.c 2012-11-05 18:12:43 UTC (rev
53454)
@@ -66,8 +66,6 @@
char *sources[] = {"h", "e", "a", "l", "l", "o"};
int i = 0;
int passed = 0;
- int diagnosisOption = 0;
- int numAssignments;
if (ac > 1) {
printf("uh oh, unexpected args after %s\n", av[0]);
@@ -113,43 +111,25 @@
}
/* user tests */
- printf("/RED-BLACK TREE WALKING TESTS :\n");
- /*
- printf("Input 1 to display the values walk or 0 for a more"
- " detailed diagnosis display\n.");
+ printf("RED-BLACK TREE WALKING TESTS :\n");
- numAssignments = scanf("%d", &diagnosisOption);
- */
- numAssignments = 1;
- if (numAssignments != 1 || (diagnosisOption != 1 && diagnosisOption != 0))
{
- printf("ERROR AT CHOICE INPUT\n");
- return 1;
- }
+ printf("\nPREORDER:\n");
+ bu_rb_walk(testTree, 0, displayNode, 0);
+ bu_rb_diagnose_tree(testTree, 0, 0);
+ searchedValue = bu_rb_search(testTree, 0, "h");
- if (diagnosisOption == 1) {
- printf("\nPREORDER:\n");
- bu_rb_walk(testTree, 0, displayNode, 0);
- searchedValue = bu_rb_search(testTree, 0, "h");
- printf("\nPREORDER AFTER SEARCH:\n");
- bu_rb_walk(testTree, 0, displayNode, 0);
- printf("\nINORDER:\n");
- bu_rb_walk(testTree, 0, displayNode, 1);
- printf("\n");
- printf("\nPOSTORDER\n");
- bu_rb_walk(testTree, 0, displayNode, 2);
- printf("\n");
- } else {
- printf("\nPREORDER:\n");
- bu_rb_diagnose_tree(testTree, 0, 0);
- searchedValue = bu_rb_search(testTree, 0, "h");
- printf("\nPREORDER AFTER SEARCH:\n");
- bu_rb_diagnose_tree(testTree, 0, 0);
- printf("\nINORDER:\n");
- bu_rb_diagnose_tree(testTree, 0, 1);
- printf("\nPOSTORDER\n");
- bu_rb_diagnose_tree(testTree, 0, 2);
- }
+ printf("\nPREORDER AFTER SEARCH:\n");
+ bu_rb_walk(testTree, 0, displayNode, 0);
+ bu_rb_diagnose_tree(testTree, 0, 0);
+ printf("\nINORDER:\n");
+ bu_rb_walk(testTree, 0, displayNode, 1);
+ bu_rb_diagnose_tree(testTree, 0, 1);
+
+ printf("\nPOSTORDER\n");
+ bu_rb_walk(testTree, 0, displayNode, 2);
+ bu_rb_diagnose_tree(testTree, 0, 2);
+
if (passed != 3)
return 1;
return 0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
