Extracted ndarray encoding and decoding.

DG_Approximation.py

@@ -6,7 +6,7 @@ Discussion:
 
 Urgent:
 TODO: Rename Vector to Basis
-TODO: Extract ndarray encoding and decoding
+TODO: Extract ndarray encoding and decoding -> Done
 TODO: Hard-code simplification of cell average/reconstruction in basis
 TODO: Make basis variables public (if feasible)
 TODO: Contain polynomial degree in basis
@@ -67,23 +67,12 @@ import Quadrature
 import Update_Scheme
 from Basis_Function import OrthonormalLegendre
 from projection_utils import calculate_cell_average
+from encoding_utils import encode_ndarray
 
 x = Symbol('x')
 sns.set()
 
 
-def encode_ndarray(obj):
-    if isinstance(obj, np.ndarray):
-        return obj.tolist()
-    return obj
-
-
-def decode_ndarray(obj):
-    if isinstance(obj, list):
-        return np.asarray(obj)
-    return obj
-
-
 class DGScheme:
     """Class for Discontinuous Galerkin Method.
 

Plotting.py

@@ -21,7 +21,7 @@ from Initial_Condition import InitialCondition
 from Basis_Function import Vector
 from projection_utils import calculate_exact_solution,\
     calculate_approximate_solution
-from DG_Approximation import decode_ndarray
+from encoding_utils import decode_ndarray
 
 
 matplotlib.use('Agg')

encoding_utils.py

+# -*- coding: utf-8 -*-
+"""
+@author: Laura C. Kühle
+
+"""
+import numpy as np
+
+
+def encode_ndarray(obj):
+    if isinstance(obj, np.ndarray):
+        return obj.tolist()
+    return obj
+
+
+def decode_ndarray(obj):
+    if isinstance(obj, list):
+        return np.asarray(obj)
+    return obj