Fixed a peculiar formula residue bug...eeew, formula residue. Also added a

clear function to Bu::Stack

1 files changed, 23 insertions, 4 deletions

diff --git a/src/tests/formula.cpp b/src/tests/formula.cpp
index b3b0d5c..40b10a5 100644
--- a/src/tests/formula.cpp
+++ b/src/tests/formula.cpp
@@ -18,7 +18,7 @@ int main( int argc, char *argv[] )
         Bu::Formula<uint32_t> uForm;
         Bu::Formula<double> dForm;
 
-        class CeilFunc : public Bu::Formula<double>::Func
+        class DblCeilFunc : public Bu::Formula<double>::Func
         {
         public:
                 virtual double operator()( double x )
@@ -27,10 +27,29 @@ int main( int argc, char *argv[] )
                 }
         };
 
-        dForm.hFunc.insert( "ceil", new CeilFunc() );
+        dForm.hFunc.insert( "ceil", new DblCeilFunc() );
+        
+        class IntCeilFunc : public Bu::Formula<uint32_t>::Func
+        {
+        public:
+                virtual uint32_t operator()( uint32_t x )
+                {
+                        return x;
+                }
+        };
 
-//      printf("u: %s = %u\n", argv[1], uForm.run( argv[1] ) );
-        printf("d: %s = %f\n", argv[1], dForm.run( argv[1] ) );
+        uForm.hFunc.insert( "ceil", new IntCeilFunc() );
+
+        uForm.hVars.insert("x", 10 );
+        dForm.hVars.insert("x", 10.00 );
+        uForm.hVars.insert("y", 10 );
+        dForm.hVars.insert("y", 10.00 );
+
+        for( int j = 1; j < argc; j++ )
+        {
+                printf("u: %s = %u\n", argv[j], uForm.run( argv[j] ) );
+                printf("d: %s = %f\n", argv[j], dForm.run( argv[j] ) );
+        }
 
         return 0;
 }