diff --git a/docs/api_doc/_modules/underworld.html b/docs/api_doc/_modules/underworld.html index 9a7d0beec..61fbbf846 100644 --- a/docs/api_doc/_modules/underworld.html +++ b/docs/api_doc/_modules/underworld.html @@ -159,7 +159,7 @@

Source code for underworld

 on a geological timescale.
 """
 
-__version__ = "2.3.0-dev"
+__version__ = "2.2.1b"
 
 # ok, first need to change default python dlopen flags to global
 # this is because when python imports the module, the shared libraries are loaded as RTLD_LOCAL
diff --git a/docs/api_doc/_modules/underworld/function/misc.html b/docs/api_doc/_modules/underworld/function/misc.html
index ce8f1fcf4..f8c673f52 100644
--- a/docs/api_doc/_modules/underworld/function/misc.html
+++ b/docs/api_doc/_modules/underworld/function/misc.html
@@ -149,7 +149,7 @@ 
Source code for underworld.function.misc
     
     Parameters
     ----------
-    value: int,float,bool. (iterables permitted)
+    value: int,float,bool, iterable
         The value the function should return. Note that iterable objects
         which contain valid types are permitted, but must be homogeneous
         in their type.
@@ -248,14 +248,13 @@ 
Source code for underworld.function.misc
 
 
[docs]class max(_Function):
     """ 
-    max function.  Returns the maximum of the results returned from 
-    its two argument function.
+    Returns the maximum of the results returned from its two argument function.
     
     Parameters
     ----------
     fn1: underworld.function.Function
         First argument function. Function must return a float type.
-    fn1: underworld.function.Function
+    fn2: underworld.function.Function
         Second argument function. Function must return a float type.
         
     Example
@@ -305,14 +304,13 @@ 
Source code for underworld.function.misc
 
 
[docs]class min(_Function):
     """ 
-    min function.  Returns the minimum of the results returned from
-    its two argument function.
+    Returns the minimum of the results returned from its two argument function.
     
     Parameters
     ----------
     fn1: underworld.function.Function
         First argument function. Function must return a float type.
-    fn1: underworld.function.Function
+    fn2: underworld.function.Function
         Second argument function. Function must return a float type.
         
     Example
diff --git a/docs/api_doc/underworld.function.misc.html b/docs/api_doc/underworld.function.misc.html
index c5834b643..b16ae4586 100644
--- a/docs/api_doc/underworld.function.misc.html
+++ b/docs/api_doc/underworld.function.misc.html
@@ -163,13 +163,13 @@ 
classes:
 underworld.function.misc.max
-max function.  Returns the maximum of the results returned from
+Returns the maximum of the results returned from its two argument function.
 
 underworld.function.misc.constant
 This function returns a constant value.
 
 underworld.function.misc.min
-min function.  Returns the minimum of the results returned from
+Returns the minimum of the results returned from its two argument function.
 
 
 
@@ -183,15 +183,14 @@ 
classes:
 class underworld.function.misc.max(fn1, fn2, **kwargs)[source]
 
Bases: underworld.function._function.Function

-
max function.  Returns the maximum of the results returned from
-its two argument function.

+
Returns the maximum of the results returned from its two argument function.

 
@@ -238,7 +237,7 @@ 
classes:
 

-
@@ -279,15 +278,14 @@ 
classes:
 class underworld.function.misc.min(fn1, fn2, **kwargs)[source]
 
Bases: underworld.function._function.Function

-
min function.  Returns the minimum of the results returned from
-its two argument function.

+
Returns the minimum of the results returned from its two argument function.

 

 
 
 
 
Parameters:
 
 

 
Parameters:value (int,float,bool. (iterables permitted)) – The value the function should return. Note that iterable objects
+
Parameters:value (int,float,bool, iterable) – The value the function should return. Note that iterable objects
 which contain valid types are permitted, but must be homogeneous
 in their type.
 

diff --git a/libUnderworld/Underworld/Function/src/Tensor.cpp b/libUnderworld/Underworld/Function/src/Tensor.cpp
index 35737f0b2..43b7fba88 100644
--- a/libUnderworld/Underworld/Function/src/Tensor.cpp
+++ b/libUnderworld/Underworld/Function/src/Tensor.cpp
@@ -60,7 +60,7 @@ Fn::TensorFunc::func Fn::TensorFunc::getFunction( IOsptr sample_input )
     if ( _partFunc == get_symmetric ) {
         if (iotype!=FunctionIO::Tensor)
             throw std::invalid_argument("TensorFunc expects Tensor input for 'get_symmetric' function.");
-        unsigned outsize = (dim = 2) ? 3 : 6;
+        unsigned outsize = (dim==2) ? 3 : 6;
         std::shared_ptr _output_sp = std::make_shared(outsize,FunctionIO::SymmetricTensor);
         IO_double* _output = _output_sp.get();
         return [_output,_output_sp,_func,dim](IOsptr input)->IOsptr {
diff --git a/underworld/function/misc.py b/underworld/function/misc.py
index 798a56ae3..bcc40b462 100644
--- a/underworld/function/misc.py
+++ b/underworld/function/misc.py
@@ -18,7 +18,7 @@ class constant(_Function):
     
     Parameters
     ----------
-    value: int,float,bool. (iterables permitted)
+    value: int,float,bool, iterable
         The value the function should return. Note that iterable objects
         which contain valid types are permitted, but must be homogeneous
         in their type.
@@ -117,14 +117,13 @@ def _GetIOForPyInput(self, value):
 
 class max(_Function):
     """ 
-    max function.  Returns the maximum of the results returned from 
-    its two argument function.
+    Returns the maximum of the results returned from its two argument function.
     
     Parameters
     ----------
     fn1: underworld.function.Function
         First argument function. Function must return a float type.
-    fn1: underworld.function.Function
+    fn2: underworld.function.Function
         Second argument function. Function must return a float type.
         
     Example
@@ -174,14 +173,13 @@ def __init__(self, fn1, fn2, **kwargs):
 
 class min(_Function):
     """ 
-    min function.  Returns the minimum of the results returned from
-    its two argument function.
+    Returns the minimum of the results returned from its two argument function.
     
     Parameters
     ----------
     fn1: underworld.function.Function
         First argument function. Function must return a float type.
-    fn1: underworld.function.Function
+    fn2: underworld.function.Function
         Second argument function. Function must return a float type.
         
     Example


 
 
 
 
Parameters: