Added support for convex and nonconvex price functions using the lambda formulation, now also without blocks. Tests were slightly adjusted too.

Added support for convex and nonconvex price functions using the lambda formulation, for now only using blocks. Tests were slightly adjusted too.

Added support for convex and nonconvex price functions using the delta formulation, with and without blocks. Revised the tests too.

Added support for convex price functions using the delta formulation and blocks. Tests were revised too.