Fix integrate bridge. Stop importing calculus and trig functions from sympy by default.

Author: Kasper Peeters

core/cadabra2_defaults.py.in

@@ -103,12 +103,12 @@ except:
     sympy = Sympy()
 
 if sympy.__version__ != "unavailable":
-    from sympy import factor
-    from sympy import integrate
-    from sympy import diff
+#    from sympy import factor
+#    from sympy import integrate
+#    from sympy import diff
     from sympy import symbols
     from sympy import latex
-    from sympy import sin, cos, tan, sqrt, trigsimp
+#    from sympy import sin, cos, tan, sqrt, trigsimp
     from sympy import Matrix as sMatrix
 
 # Whether running in command-line mode or as client-server, there always

core/packages/cdb/sympy/calculus.cnb

@@ -101,7 +101,7 @@
 			"cell_id": 15467993639628642890,
 			"cell_origin": "client",
 			"cell_type": "input",
-			"source": "def integrate(ex1, *args):\n   ret = $@(ex1)$\n   sb = SympyBridge(ret)\n   iranges = []\n   for arg in args:\n      if isinstance(arg, tuple):\n          # print(arg)\n          sbtmp = SympyBridge(arg[0])\n          tpl = (sbtmp.to_sympy(), arg[1], arg[2])\n          iranges.append(tpl)\n          # print(iranges)\n          sb.from_sympy( str(sympy.integrate( sb.to_sympy(), *iranges) ) )\n      else:\n         sbtmp = SympyBridge(arg)\n         sb.from_sympy( str(sympy.integrate( sb.to_sympy(), sbtmp.to_sympy() ) ))\n   return ret"
+			"source": "def integrate(ex1, *args):\n   ret = $@(ex1)$\n   sb = SympyBridge(ret)\n   iranges = []\n   for arg in args:\n      if isinstance(arg, tuple):\n          # print(arg)\n          tmp0 = SympyBridge(arg[0]).to_sympy()\n          tmp1 = SympyBridge(arg[1]).to_sympy() if isinstance(arg[1], Ex) else arg[1]\n          tmp2 = SympyBridge(arg[2]).to_sympy() if isinstance(arg[2], Ex) else arg[2]\n          tpl = ( tmp0, tmp1, tmp2 )\n          iranges.append(tpl)\n      else:\n         tmp = SympyBridge(arg).to_sympy()\n         iranges.append( tmp )\n      \n   # print(sb.to_sympy())\n   # print(iranges)\n   sb.from_sympy( str(sympy.integrate( sb.to_sympy(), *iranges) ) )\n   return ret"
 		},
 		{
 			"cell_id": 3801120048138997797,
@@ -124,18 +124,18 @@
 			"cell_type": "input",
 			"cells": [
 				{
-					"cell_id": 17063052500213847361,
+					"cell_id": 13720722688581652399,
 					"cell_origin": "server",
 					"cell_type": "latex_view",
 					"cells": [
 						{
-							"cell_id": 7172967486322218859,
+							"cell_id": 8372911878813724282,
 							"cell_origin": "server",
 							"cell_type": "input_form",
-							"source": " 27/2 "
+							"source": " 9/2 "
 						}
 					],
-					"source": "\\begin{dmath*}{}\\frac{27}{2}\\end{dmath*}"
+					"source": "\\begin{dmath*}{}\\frac{9}{2}\\end{dmath*}"
 				}
 			],
 			"ignore_on_import": true,
@@ -162,12 +162,12 @@
 			"cell_type": "input",
 			"cells": [
 				{
-					"cell_id": 5978718279542050921,
+					"cell_id": 7232070191902961908,
 					"cell_origin": "server",
 					"cell_type": "latex_view",
 					"cells": [
 						{
-							"cell_id": 4267217324248610000,
+							"cell_id": 17231141432298576435,
 							"cell_origin": "server",
 							"cell_type": "input_form",
 							"source": " 1/3 (x)**3 y"
@@ -199,12 +199,12 @@
 			"cell_type": "input",
 			"cells": [
 				{
-					"cell_id": 9023252122610197719,
+					"cell_id": 5833311602414970559,
 					"cell_origin": "server",
 					"cell_type": "latex_view",
 					"cells": [
 						{
-							"cell_id": 2730904024514227788,
+							"cell_id": 13975661933126978867,
 							"cell_origin": "server",
 							"cell_type": "input_form",
 							"source": " 1/4 (y)**2"