Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (4)
...@@ -35,10 +35,12 @@ class Database: ...@@ -35,10 +35,12 @@ class Database:
... assert next(db.filter_params(params))['params'] == params # get data set, keys are 'params', 'results' ... assert next(db.filter_params(params))['params'] == params # get data set, keys are 'params', 'results'
... # and 'env' ... # and 'env'
... # get a pandas object with all results matching a query ... # get a pandas object with all results matching a query
... db.to_pandas({'dx': 1.5}, remove_prefix=True) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE ... df = db.to_pandas({'dx': 1.5}, remove_prefix=True)
dx method error ... # order columns alphabetically (just for doctest output)
pk ... df.reindex(sorted(df.columns), axis=1) # doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
... 1.5 finite_diff 0.000001 dx error method
pk
... 1.5 0.000001 finite_diff
""" """
class SimulationResult(blitzdb.Document): class SimulationResult(blitzdb.Document):
......
...@@ -419,7 +419,10 @@ def plot_3d(stencil, figure=None, axes=None, data=None, textsize='8'): ...@@ -419,7 +419,10 @@ def plot_3d(stencil, figure=None, axes=None, data=None, textsize='8'):
if figure is None: if figure is None:
figure = plt.figure() figure = plt.figure()
axes = figure.gca(projection='3d') axes = figure.gca(projection='3d')
axes.set_aspect("equal") try:
axes.set_aspect("equal")
except NotImplementedError:
pass
if data is None: if data is None:
data = [None] * len(stencil) data = [None] * len(stencil)
......
...@@ -3,7 +3,6 @@ import io ...@@ -3,7 +3,6 @@ import io
import os import os
import sys import sys
from contextlib import redirect_stdout from contextlib import redirect_stdout
from distutils.extension import Extension
from importlib import import_module from importlib import import_module
from setuptools import find_packages, setup from setuptools import find_packages, setup
...@@ -59,6 +58,7 @@ def readme(): ...@@ -59,6 +58,7 @@ def readme():
def cython_extensions(*extensions): def cython_extensions(*extensions):
from distutils.extension import Extension
ext = '.pyx' if USE_CYTHON else '.c' ext = '.pyx' if USE_CYTHON else '.c'
result = [Extension(e, [e.replace('.', '/') + ext]) for e in extensions] result = [Extension(e, [e.replace('.', '/') + ext]) for e in extensions]
if USE_CYTHON: if USE_CYTHON:
......