Updated tests.

Author: Dilawar Singh

builtins/Function.cpp

@@ -482,11 +482,9 @@ void Function::addVariable(const string& name)
 
 void Function::callbackAddSymbol(const string& name)
 {
-    cout << "callback Adding " << name << endl;
+    // Add only if doesn't exist.
     if(varIndex_.find(name) == varIndex_.end())
         addXByName(name);
-    else
-        cerr << name  << " already exists." << endl;
 }
 
 /* --------------------------------------------------------------------------*/

python/moose/wrapper.py

@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
-# Wrappers around _moose.so classes.
-
 from __future__ import print_function, division, absolute_import
 
-__author__           = "Dilawar Singh"
-__copyright__        = "Copyright 2019-, Dilawar Singh"
-__maintainer__       = "Dilawar Singh"
-__email__            = "[email protected]"
+# Wrappers around _moose.so classes.
+
+__author__ = "Dilawar Singh"
+__copyright__ = "Copyright 2019-, Dilawar Singh"
+__maintainer__ = "Dilawar Singh"
+__email__ = "[email protected]"
 
-import sys
 import difflib
 import moose._moose as _moose
 import pprint
@@ -35,14 +34,16 @@ def _didYouMean(v, options):
     """
     return ' or '.join(difflib.get_close_matches(v, list(options), n=2))
 
+
 def _eval(expr):
     try:
-        if isinstance(expr, (int,float)):
+        if isinstance(expr, (int, float)):
             return expr
         return eval(str(expr))
     except Exception:
         return expr
 
+
 def _prettifyExpr(expr):
     global sympyFound_
     if not sympyFound_:
@@ -55,19 +56,23 @@ def _prettifyExpr(expr):
 
 # Generic wrapper around moose.Neutral
 class Neutral(_moose.Neutral):
-
-    def __init__(self, path, n=1, g=0, dtype='Neutral'):
+    def __init__(self, path, n=1, g=0, dtype='Neutral', **kwargs):
         super(_moose.Neutral, self).__init__(path, n, g, dtype)
+        for k in kwargs:
+            try:
+                setattr(self, k, kwargs[k])
+            except AttributeError:
+                logging.warn("Attribute %s is not found. Ignoring..." % k)
 
-    def __new__(cls, pathOrObject, n=1, g=0, dtype='Neutral'):
+    def __new__(cls, pathOrObject, n=1, g=0, dtype='Neutral', **kwargs):
         path = pathOrObject
         if not isinstance(pathOrObject, str):
-            path = pathOrObject.path;
+            path = pathOrObject.path
         if _moose.exists(path):
             #  logger.info("%s already exists. Returning old element."%path)
             return _moose.element(path)
-        return super(_moose.Neutral, cls).__new__(cls, pathOrObject, n, g, dtype)
-
+        return super(_moose.Neutral, cls).__new__(cls, pathOrObject, n, g,
+                                                  dtype)
 
     def connect(self, srcField, dest, destField):
         """Wrapper around moose.connect.
@@ -82,7 +87,8 @@ def connect(self, srcField, dest, destField):
             if dym:
                 logger.warn("\tDid you mean %s?" % dym)
             else:
-                logger.warn(': Available options: %s' % ', '.join(allSrcFields))
+                logger.warn(': Available options: %s' %
+                            ', '.join(allSrcFields))
             raise NameError("Failed to connect")
         if destField not in allDestFields:
             logger.error("Could not find '{0}' in {1} destFields.".format(
@@ -91,7 +97,8 @@ def connect(self, srcField, dest, destField):
             if dym:
                 logger.warn("\tDid you mean %s?" % dym)
             else:
-                logger.warn(': Available options: %s' % ', '.join(allDestFields))
+                logger.warn(': Available options: %s' %
+                            ', '.join(allDestFields))
             raise NameError("Failed to connect")
 
         # Everything looks fine. Connect now.
@@ -108,11 +115,13 @@ class Function(_moose.Function):
     def __init__(self, path, n=1, g=0, dtype='Function', **kwargs):
         super(_moose.Function, self).__init__(path, n, g, dtype)
         for k in kwargs:
-            setattr(self, k, kwargs[k])
+            try:
+                setattr(self, k, kwargs[k])
+            except AttributeError:
+                logging.warn("Attribute %s is not found. Ignoring..." % k)
 
     def __getitem__(self, key):
-        """Override [] operator.
-        FIXME: This function is tricky. Fix it later.
+        """Override [] operator. It returns the linked variable by name.
         """
         assert self.numVars > 0
         return self.x[self.xindex[key]]
@@ -122,11 +131,13 @@ def compile(self, expr, constants={}, variables=[], mode=0, **kwargs):
         """
         __expr = expr
         # Replace constants.
-        constants = { k: v for k, v in 
-                sorted(constants.items(), key=lambda x: len(x)) }
+        constants = {
+            k: v
+            for k, v in sorted(constants.items(), key=lambda x: len(x))
+        }
         for i, constName in enumerate(constants):
             # replace constName with 'c%d' % i
-            mooseConstName = 'c%d'%i
+            mooseConstName = 'c%d' % i
             expr = expr.replace(constName, mooseConstName)
             self.c[mooseConstName] = _eval(constants[constName])
 
@@ -141,7 +152,7 @@ def compile(self, expr, constants={}, variables=[], mode=0, **kwargs):
             msg += _prettifyExpr(__expr)
             msg += "\nto, \n"
             msg += _prettifyExpr(expr)
-            logging.warn( msg.replace('\n', '\n ﹅ '))
+            logging.warn(msg.replace('\n', '\n ﹅ '))
 
     # alias
     setExpr = compile
@@ -155,3 +166,15 @@ def printUsingSympy(self):
         """
         import sympy
         sympy.pprint(self.sympyExpr())
+
+
+class StimulusTable(Neutral):
+    """StimulusTable
+    """
+    def __init__(self, path, n=1, g=0, dtype='StimulusTable', **kwargs):
+        super(Neutral, self).__init__(path, n, g, dtype)
+        for k in kwargs:
+            try:
+                setattr(self, k, kwargs[k])
+            except AttributeError:
+                logging.warn("Attribute %s is not found. Ignoring..." % k)

tests/py_moose/test_wrapper.py

@@ -6,7 +6,65 @@
 __email__            = "[email protected]"
 
 import moose
-print('[INFO] Using moose from %s' % moose.about())
+import numpy as np
+print( "[INFO ] Using moose %s form %s" % (moose.version(), moose.__file__) )
+
+def create_func( funcname, expr ):
+    f = moose.Function( funcname )
+    f.expr = expr
+    t = moose.Table( funcname + 'tab' )
+    t.connect('requestOut', f, 'getValue')
+    moose.setClock( f.tick, 0.1)
+    moose.setClock( t.tick, 0.1)
+    return f, t
+
+def test_function():
+    nsteps = 5
+    simtime = nsteps
+    dt = 1.0
+    fn1 = moose.Function('/fn1', expr = 'B+A+y0+y1')
+    inputs = np.arange(0, nsteps+1, 1.0)
+    x0 = moose.StimulusTable('/x0', vector=inputs, startTime = 0.0
+            , stopTime = simtime, stepPosition = 0.0)
+    print('x0', x0.vector)
+    inputs /= 10
+    x1 = moose.StimulusTable('/x1', vector=inputs, startTime=0.0
+            , stopTime=simtime, stepPosition=0.0, k = 11)
+    print('x1', x1.vector)
+    inputs /= 10
+    y0 = moose.StimulusTable('/y0', vector=inputs, startTime=0.0
+            , stopTime=simtime, stepPosition=0.0)
+    print('y0', y0.vector)
+    inputs /= 10
+    y1 = moose.StimulusTable('/y1', vector=inputs, startTime=0.0
+            , stopTime=simtime, stepPosition=0.0)
+    print('y1', y1.vector)
+    x0.connect('output', fn1['A'], 'input')
+    x1.connect('output', fn1['B'], 'input')
+    fn1.connect('requestOut', y0, 'getOutputValue')
+    fn1.connect('requestOut', y1, 'getOutputValue')
+
+    z1 = moose.Table('/z1')
+    z1.connect('requestOut', fn1, 'getValue')
+    for ii in range(32):
+        moose.setClock(ii, dt)
+    moose.reinit()
+    moose.start(simtime)
+    expected = [0, 1.1, 2.211, 3.322, 4.433, 5.544]
+    assert np.allclose(z1.vector, expected), "Excepted %s, got %s" % (expected, z1.vector )
+    print( 'Passed order vars' )
+
+
+def test_dynamic_lookup():
+    f, t = create_func( 'fmod', 'A+(B/2.0)' )
+    moose.reinit()
+    moose.start(20)
+    y = t.vector
+    assert (np.fmod(y, 2) == y).all()
+    assert(np.isclose(np.max(y), 1.9)), "Expected 1.9 got %s" % np.max(y)
+    assert(np.isclose(np.min(y), 0.0)), "Expected 0.0 got %s" % np.min(y)
+    print('Passed fmod(t,2)')
+
 
 def test_creation():
     a1 = moose.Neutral('a')
@@ -19,6 +77,7 @@ def test_creation():
 
 def test_print():
     a = moose.Function('f', expr='sqrt(sin(x0))+cos(x1)^2+ln(20+sin(t))')
+
     # Get equivalent sympy expression. And do whatever you like with it.
     sympyExpr = a.sympyExpr()
     print('Sympy expression is:', sympyExpr)
@@ -31,11 +90,11 @@ def test_basic():
     f.expr = 'A+B+sqrt(B)+zhadu(q)'
     print(f)
 
-
 def main():
+    test_function()
+    test_basic()
     test_creation()
     test_print()
-    test_basic()
 
 if __name__ == '__main__':
     main()