symbolics: cleaner repr of Cast

Author: mloubout

devito/symbolics/extended_sympy.py

@@ -10,7 +10,8 @@
 from devito.finite_differences.elementary import Min, Max
 from devito.tools import (Pickable, Bunch, as_tuple, is_integer, float2,  # noqa
                           float3, float4, double2, double3, double4, int2, int3,
-                          int4, dtype_to_ctype, ctypes_to_cstr, ctypes_vector_mapper)
+                          int4, dtype_to_ctype, ctypes_to_cstr, ctypes_vector_mapper,
+                          ctypes_to_cstr)
 from devito.types import Symbol
 from devito.types.basic import Basic
 
@@ -422,7 +423,10 @@ def _C_ctype(self):
 
     @property
     def _op(self):
-        return '(%s)' % self._C_ctype
+        return '(%s)' % ctypes_to_cstr(self._C_ctype)
+
+    def __str__(self):
+        return "%s%s" % (self._op, self.base)
 
 
 class IndexedPointer(sympy.Expr, Pickable, BasicWrapperMixin):

examples/userapi/06_sparse_operations.ipynb

@@ -277,8 +277,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Eq(posx, (int)(floor((-o_x + s_coords(p_s, 0))/h_x)))\n",
-      "Eq(posy, (int)(floor((-o_y + s_coords(p_s, 1))/h_y)))\n",
+      "Eq(posx, (int)floor((-o_x + s_coords(p_s, 0))/h_x))\n",
+      "Eq(posy, (int)floor((-o_y + s_coords(p_s, 1))/h_y))\n",
       "Eq(px, -floor((-o_x + s_coords(p_s, 0))/h_x) + (-o_x + s_coords(p_s, 0))/h_x)\n",
       "Eq(py, -floor((-o_y + s_coords(p_s, 1))/h_y) + (-o_y + s_coords(p_s, 1))/h_y)\n",
       "Eq(sum, 0.0)\n",
@@ -484,8 +484,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Eq(posx, (int)(floor((-o_x + s_coords(p_s, 0))/h_x)))\n",
-      "Eq(posy, (int)(floor((-o_y + s_coords(p_s, 1))/h_y)))\n",
+      "Eq(posx, (int)floor((-o_x + s_coords(p_s, 0))/h_x))\n",
+      "Eq(posy, (int)floor((-o_y + s_coords(p_s, 1))/h_y))\n",
       "Eq(sum, 0.0)\n",
       "Inc(sum, wsincrsx(p_s, rsx + 3)*wsincrsy(p_s, rsy + 3)*f(t, rsx + posx, rsy + posy))\n",
       "Eq(s(time, p_s), sum)\n"