[brlcad-commits] SF.net SVN: brlcad: [31809] brlcad/trunk/src/libpc

[<hom...@us...>]

Revision: 31809
          http://brlcad.svn.sourceforge.net/brlcad/?rev=31809&view=rev
Author:   homovulgaris
Date:     2008-07-13 09:55:36 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
Testing pc_pc_set modifications and Parser::parse()

Modified Paths:
--------------
    brlcad/trunk/src/libpc/Makefile.am
    brlcad/trunk/src/libpc/solver_test.cpp

Modified: brlcad/trunk/src/libpc/Makefile.am
===================================================================
--- brlcad/trunk/src/libpc/Makefile.am	2008-07-13 16:44:51 UTC (rev 31808)
+++ brlcad/trunk/src/libpc/Makefile.am	2008-07-13 16:55:36 UTC (rev 31809)
@@ -4,9 +4,7 @@
 
 # TODO: check existing boost using AX_BOOST_BASE([MINIMUM-VERSION]) ? in configure.ac
 #       and remove blind Include
-AM_CPPFLAGS = \
-	${TCL_CPPFLAGS} \
-	${BOOST_CPPFLAGS}
+AM_CPPFLAGS = ${TCL_CPPFLAGS} ${BOOST_CPPFLAGS}
 
 noinst_PROGRAMS = \
 	pc_test \
@@ -37,7 +35,7 @@
 
 solver_test_SOURCES = solver_test.cpp
 solver_test_LDADD = libpc.la
-solver_test_CPPFLAGS = ${BOOST_CPPFLAGS}
+solver_test_CPPFLAGS = ${BOOST_CPPFLAGS} ${TCL_CPPFLAGS}
 
 FAST_OBJECTS = \
 	$(libpc_nil_la_OBJECTS) \

Modified: brlcad/trunk/src/libpc/solver_test.cpp
===================================================================
--- brlcad/trunk/src/libpc/solver_test.cpp	2008-07-13 16:44:51 UTC (rev 31808)
+++ brlcad/trunk/src/libpc/solver_test.cpp	2008-07-13 16:55:36 UTC (rev 31809)
@@ -50,8 +50,22 @@
 int main()
 {
     
+    struct pc_pc_set pcs;
+    struct pc_param * par;
+    struct pc_constrnt * constrnt;
+    PC_INIT_PCSET(pcs);
+    PC_GETPARAMETER(par);
+    PC_GETCONSTRAINT(constrnt);
+    par->pname[0]='T';
+    constrnt->cname[0]='C';
+    PC_PCSET_PUSHP(pcs,par);
+    PC_PCSET_PUSHC(pcs,constrnt);
+    
+    Parser myparser;
+    myparser.parse(&pcs);
+
     /* Stage I : Checking Constrained Classes */
-    //std::cout<<"______________________________________________________________"<<std::endl<<std::endl;
+    //std::cout<<"______________________________________________________________"<<std::endl;
     //std::cout<<"____________________Checking Network Classes__________________"<<std::endl;
 
     using namespace boost;
@@ -60,7 +74,7 @@
     }
 
     /* Stage II : Checking Network Classes */
-    //std::cout<<"_________________________________________________________"<<std::endl<<std::endl;
+    //std::cout<<"_________________________________________________________"<<std::endl;
     //std::cout<<"____________________Checking Network  Classes________" <<std::endl;
 
     typedef boost::adjacency_list<vecS, vecS, bidirectionalS, 
@@ -110,13 +124,15 @@
     }
     //std::cout<<"___"<< boost::num_vertices(N.G)<<std::endl;
 
+    N.display();
     /*N.display();
     S = N.solve();
     S.display();
     */
-    N.display();
+    GTSolver<int> GTS;
+    BTSolver<int> BTS;
+/*    
     std::cout<<"-----------------------------"<<std::endl;
-    GTSolver<int> GTS;
     GTS.solve(&N,&S);
     std::cout<<"Solution using Generate-Test"<<std::endl;
     S.display();
@@ -124,7 +140,6 @@
     S.clear();
     std::cout<<"-----------------------------"<<std::endl;
     
-    BTSolver<int> BTS;
     BTS.solve(&N,&S);
     std::cout<<"Solution using BackTracking"<<std::endl;
 
@@ -133,7 +148,7 @@
     std::cout<<"Number of Constraint checks performed"<<std::endl;
     std::cout<<"Generate-Test Solution:"<< GTS.numChecks()<<std::endl;
     std::cout<<"BackTracking based Solution:" <<BTS.numChecks()<<std::endl;
-
+*/
     }
 
     return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.