diff --git a/DG_Approximation.py b/DG_Approximation.py index d15fb5902ab94634f7f9506d8428345bdb48bbfd..9e1cb823f3196d48c023f966660667ab71bf18d9 100644 --- a/DG_Approximation.py +++ b/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. diff --git a/Plotting.py b/Plotting.py index 43b854b6d6ffffac3805cdbe729291ef48c867e3..3578cbce0dc3a15fec88149a1d0cd7c402fecdac 100644 --- a/Plotting.py +++ b/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') diff --git a/encoding_utils.py b/encoding_utils.py new file mode 100644 index 0000000000000000000000000000000000000000..de89b48cce79f96f99152b46966bcb0f49c3972f --- /dev/null +++ b/encoding_utils.py @@ -0,0 +1,18 @@ +# -*- 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