Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.1.0 #318

Merged
merged 145 commits into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
af2585c
Closes #289
briandrawert Jul 25, 2022
4fb7f1e
Fixed defaults for Domain.add_point. closes #299.
BryanRumsey Jul 26, 2022
0007cae
Added a class for cominatory geometry.
BryanRumsey Jul 27, 2022
1052431
Added numpy.bool_ to geometry.inside return type check.
BryanRumsey Jul 27, 2022
de83919
Added the new geometry to the import sturcture.
BryanRumsey Jul 27, 2022
a2bc83f
Updated cylinder demo to use new geometry for middle type.
BryanRumsey Jul 27, 2022
a8a17a6
Merge pull request #290 from StochSS/fix_289
BryanRumsey Jul 27, 2022
31615f6
Updated version to v1.1.0
BryanRumsey Jul 27, 2022
e5668f7
Added a lattice error class.
BryanRumsey Jul 27, 2022
19aa6ab
Added the lattice module.
BryanRumsey Jul 27, 2022
abcd36e
Added a base class for lattices.
BryanRumsey Jul 27, 2022
0f4a5fe
Added missing kwargs arg to apply.
BryanRumsey Jul 27, 2022
c7e9b0d
Added the cartesian lattice.
BryanRumsey Jul 27, 2022
6c45d5f
Added checks to apply function to ensure proper args are passed. Add…
BryanRumsey Jul 27, 2022
628eb00
Bug fixes.
BryanRumsey Jul 27, 2022
9187fc7
Added the cartesian and spherical lattices to the import structure.
BryanRumsey Jul 27, 2022
40383de
Added 2D support to the cartesian lattice.
BryanRumsey Jul 29, 2022
78086d8
Added validation checks to combinatory geometry.
BryanRumsey Jul 29, 2022
bd1fa75
Merge branch 'geometry-combinations' of https://github.com/StochSS/Sp…
BryanRumsey Jul 29, 2022
165f82c
Added cylindrical lattice.
BryanRumsey Jul 29, 2022
81a1014
Added the cylindrical lattice to the import structure.
BryanRumsey Jul 29, 2022
3db8f5e
Bug fixes.
BryanRumsey Jul 29, 2022
0ffc721
Merge branch 'geometry-combinations' of https://github.com/StochSS/Sp…
BryanRumsey Jul 29, 2022
6cf9c8a
Fixed the get bounding box function.
BryanRumsey Jul 29, 2022
19668bc
Added function to update the domain limits after all particles have b…
BryanRumsey Jul 29, 2022
afa0ba2
Updated the get bounding box function.
BryanRumsey Jul 29, 2022
b20e2a2
Added the XMLMesh lattice.
BryanRumsey Jul 29, 2022
762fc7e
Added the XMLMesh to the import stucture.
BryanRumsey Jul 29, 2022
bb5b312
More bug fixes.
BryanRumsey Jul 29, 2022
6ed15d8
Merge branch 'geometry-combinations' of https://github.com/StochSS/Sp…
BryanRumsey Jul 29, 2022
8053a63
Added the mesh IO lattice.
BryanRumsey Jul 29, 2022
1fc7323
Added the mesh IO lattice to the import structure.
BryanRumsey Jul 29, 2022
a49596d
Added stochss lattice class.
BryanRumsey Jul 31, 2022
5654ef2
Added the stochss lattice class to the import structure.
BryanRumsey Jul 31, 2022
82c0f73
Yet more bug fixes.
BryanRumsey Aug 1, 2022
99a0c5a
Bug fixes.
BryanRumsey Aug 2, 2022
dea3c8b
Added the error class for the transformation module.
BryanRumsey Aug 2, 2022
36a719c
Added the transformation module.
BryanRumsey Aug 2, 2022
c9ca676
Fixed indentation error.
BryanRumsey Aug 3, 2022
c5c7b46
Added the base transformation class to the import structure.
BryanRumsey Aug 3, 2022
c3ba787
Added the rotation transformation class.
BryanRumsey Aug 3, 2022
fb89aca
Added the rotation transformation class to the import structure.
BryanRumsey Aug 3, 2022
7399a30
Moved the apply and inside functions to the base class. Added the tr…
BryanRumsey Aug 3, 2022
61e7c4e
Final updates to translation transformation.
BryanRumsey Aug 3, 2022
cc4487f
Added translation transformation to the import structure.
BryanRumsey Aug 3, 2022
a6afbc1
Fixed issue with tests.
BryanRumsey Aug 4, 2022
8c65a18
Added actions to domain.
BryanRumsey Aug 5, 2022
de1d346
Started a validate action function. Added function for applying fill …
BryanRumsey Aug 5, 2022
d2097e2
Added and update flag to find boundary points function.
BryanRumsey Aug 5, 2022
ab00d76
Extended the action validator to cover remove actions. Added function…
BryanRumsey Aug 5, 2022
f07bd20
Added a function to apply multiple actions.
BryanRumsey Aug 5, 2022
4844451
Added actions to the domain constructor and added returns for particl…
BryanRumsey Aug 5, 2022
0c21be8
Bug fixes.
BryanRumsey Aug 5, 2022
a802794
Fixed circular imports.
BryanRumsey Aug 5, 2022
a6dd4d8
Removed unused import.
BryanRumsey Aug 5, 2022
3c5e303
Merge branch 'lattice' of https://github.com/StochSS/SpatialPy into t…
BryanRumsey Aug 5, 2022
4732e95
Merge branch 'transformations' of https://github.com/StochSS/SpatialP…
BryanRumsey Aug 5, 2022
1ba7580
Cleanup and restructure.
BryanRumsey Aug 5, 2022
2f8e647
Added a function to preview a domains actions.
BryanRumsey Aug 5, 2022
4b01a61
Added an add fill action function and refactored the fill with partic…
BryanRumsey Aug 7, 2022
5fc1dc5
Added an add set action function and refactored the set properties fu…
BryanRumsey Aug 7, 2022
db5e600
Added an add remove action function.
BryanRumsey Aug 7, 2022
fad79fe
Refactored create 2D domain to use actions.
BryanRumsey Aug 8, 2022
1cdccd5
Refactored create 3D domain to use actions.
BryanRumsey Aug 8, 2022
73c945a
Refactored create 3D domain to use actions.
BryanRumsey Aug 8, 2022
5819b69
Refactored import meshio object function to use actions.
BryanRumsey Aug 8, 2022
1666011
Refactored read msh file function to use actions.
BryanRumsey Aug 8, 2022
b4fe762
Refactored read stochss domain function to use actions.
BryanRumsey Aug 8, 2022
1ed9eb6
Refactored read XML mesh function to use actions.
BryanRumsey Aug 8, 2022
f76b709
Fixed test_solver model.
BryanRumsey Aug 8, 2022
301f04c
Updated the example in README.
BryanRumsey Aug 8, 2022
c6fb9a7
Added support for meshio objects to the meshio lattice.
BryanRumsey Aug 8, 2022
39eb3b7
Merge branch 'lattice' of https://github.com/StochSS/SpatialPy into t…
BryanRumsey Aug 8, 2022
bb8cc7f
Merge branch 'transformations' of https://github.com/StochSS/SpatialP…
BryanRumsey Aug 8, 2022
68e58ba
Merge branch 'actions-and-apply-funcs' of https://github.com/StochSS/…
BryanRumsey Aug 8, 2022
e1342a6
Updated doc strings.
BryanRumsey Aug 8, 2022
57313f2
Updated the 3D cylinder demo examples.
BryanRumsey Aug 8, 2022
228e2c1
Updated diffusion validation test.
BryanRumsey Aug 8, 2022
4012d3e
Updated the G-Protien_1D example.
BryanRumsey Aug 8, 2022
669cd55
Updated the cdc42 example.
BryanRumsey Aug 8, 2022
b235122
Updated coral reef example.
BryanRumsey Aug 8, 2022
b09cfdc
Updated the start here example.
BryanRumsey Aug 8, 2022
af09cc2
Updated the compile time comparison test.
BryanRumsey Aug 8, 2022
b08e84e
Updated hes1 example.
BryanRumsey Aug 8, 2022
c46a216
Updated the polarisome 1D and gravity examples.
BryanRumsey Aug 8, 2022
b6698e0
Updated the polarisome 1D and gravity examples.
BryanRumsey Aug 8, 2022
ebe6a37
Updated the weir example.
BryanRumsey Aug 8, 2022
95d2c66
Bug fixes.
BryanRumsey Aug 8, 2022
3e527f1
Merge branch 'actions-and-apply-funcs' of https://github.com/StochSS/…
BryanRumsey Aug 8, 2022
ad53f02
Added the reflection transformation class.
BryanRumsey Aug 9, 2022
27389ce
Added reflect transformation to import structure.
BryanRumsey Aug 9, 2022
85d48de
Added a class for scaling transformations.
BryanRumsey Aug 9, 2022
0e3ab16
Added scaling transformations to import structure.
BryanRumsey Aug 9, 2022
e9e3cda
Fixed issue with center transformation being applied too early.
BryanRumsey Aug 9, 2022
80d428e
Fixes #313
briandrawert Aug 9, 2022
1937d8f
Merge pull request #314 from StochSS/fix_313
BryanRumsey Aug 11, 2022
7e39491
Fixed type_id error message
BryanRumsey Aug 11, 2022
ef07dea
Merge branch 'main' of github.com:stochss/SpatialPy into develop
briandrawert Aug 11, 2022
0d0c7fa
Merge branch 'scaling-transform' of github.com:stochss/SpatialPy into…
briandrawert Aug 11, 2022
b3b1344
rebuild docs
briandrawert Aug 11, 2022
b0a64df
moved links to main branch
briandrawert Aug 11, 2022
431190f
Added enable property to actions. Added apply actions call to compil…
BryanRumsey Aug 12, 2022
fe50080
Refactored type mappings to be created dynamically on Domain.compile_…
BryanRumsey Aug 12, 2022
76b53d7
Merge branch 'review-changes' of https://github.com/StochSS/SpatialPy…
BryanRumsey Aug 12, 2022
c66688f
Added enable support for domain classmethods.
BryanRumsey Aug 12, 2022
9fc1610
Merge branch 'review-changes' of https://github.com/StochSS/SpatialPy…
BryanRumsey Aug 12, 2022
159e650
Added a Domain.compile_prep call Model.add_domain.
BryanRumsey Aug 12, 2022
a1d1f3d
Merge branch 'review-changes' of https://github.com/StochSS/SpatialPy…
BryanRumsey Aug 12, 2022
feff10e
Merge branch 'lattice' of https://github.com/StochSS/SpatialPy into t…
BryanRumsey Aug 12, 2022
c0b4b01
Merge branch 'transformations' of https://github.com/StochSS/SpatialP…
BryanRumsey Aug 12, 2022
7c7da80
Merge branch 'actions-and-apply-funcs' of https://github.com/StochSS/…
BryanRumsey Aug 12, 2022
d8b0a30
Merge branch 'develop' of https://github.com/StochSS/SpatialPy into g…
BryanRumsey Aug 12, 2022
1f34493
Merge branch 'geometry-combinations' of https://github.com/StochSS/Sp…
BryanRumsey Aug 12, 2022
55c304a
Merge branch 'lattice' of https://github.com/StochSS/SpatialPy into t…
BryanRumsey Aug 12, 2022
7ed76df
Merge branch 'transformations' of https://github.com/StochSS/SpatialP…
BryanRumsey Aug 12, 2022
2f0f0dc
Merge branch 'actions-and-apply-funcs' of https://github.com/StochSS/…
BryanRumsey Aug 12, 2022
cca380f
Merge branch 'examples-with-actions' of https://github.com/StochSS/Sp…
BryanRumsey Aug 12, 2022
e746070
Merge branch 'reflect-transform' of https://github.com/StochSS/Spatia…
BryanRumsey Aug 12, 2022
95b0b26
Resolved merge conflicts.
BryanRumsey Aug 12, 2022
7267c40
Added calculations for particle volume to lattices.
BryanRumsey Aug 12, 2022
dc28507
Merge branch 'review-changes' of https://github.com/StochSS/SpatialPy…
BryanRumsey Aug 12, 2022
7352634
bug squashing.
BryanRumsey Aug 12, 2022
324fbd7
Merge branch 'review-changes' of https://github.com/StochSS/SpatialPy…
BryanRumsey Aug 12, 2022
4ce3ad3
Added a 3d cylinder example using lattices and actions.
BryanRumsey Aug 12, 2022
502aeb5
Fixed geometries.
BryanRumsey Aug 12, 2022
9c2c5b8
converting Cylinder Demo to ode_propensity_functions, correcting bug
briandrawert Aug 12, 2022
3309ef8
Merge branch 'pre_v1.1_staging' of github.com:stochss/SpatialPy into …
briandrawert Aug 12, 2022
c6d5573
Merge branch 'pre_v1.1_staging' of github.com:stochss/SpatialPy into …
briandrawert Aug 12, 2022
e316deb
updating docs
briandrawert Aug 12, 2022
65e50a8
cast all rounded values to ints.
BryanRumsey Aug 12, 2022
4651f16
Fixed issue with get bounding box.
BryanRumsey Aug 15, 2022
a454497
Merge pull request #300 from StochSS/hotfix-add-point-defaults
briandrawert Aug 15, 2022
a61b006
Merge pull request #301 from StochSS/geometry-combinations
briandrawert Aug 15, 2022
471db1a
Merge pull request #303 from StochSS/lattice
briandrawert Aug 15, 2022
13e06e1
Merge pull request #304 from StochSS/transformations
briandrawert Aug 15, 2022
f180410
Merge pull request #305 from StochSS/actions-and-apply-funcs
briandrawert Aug 15, 2022
1e95f62
Merge pull request #308 from StochSS/examples-with-actions
briandrawert Aug 15, 2022
712c334
Merge pull request #311 from StochSS/reflect-transform
briandrawert Aug 15, 2022
900bf1f
Merge pull request #312 from StochSS/scaling-transform
briandrawert Aug 15, 2022
55e6535
Merge pull request #316 from StochSS/pre_v1.1_staging
briandrawert Aug 15, 2022
641bafa
Merge pull request #317 from StochSS/review-changes
briandrawert Aug 15, 2022
b63e34b
Merge pull request #315 from StochSS/update_docs_v1.1
briandrawert Aug 15, 2022
0276e48
updated docs
briandrawert Aug 15, 2022
137af52
Fixed issue with type_id checks.
BryanRumsey Aug 15, 2022
2b77d2f
Merge pull request #302 from StochSS/develop
briandrawert Aug 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def create_birth_death(parameter_values=None):

# Define domain points and attributes of a regional space for simulation.
domain = spatialpy.Domain.create_2D_domain(
xlim=(0, 1), ylim=(0, 1), nx=10, ny=10, type_id=model.HABITAT, fixed=True
xlim=(0, 1), ylim=(0, 1), numx=10, numy=10, type_id=model.HABITAT, fixed=True
)
model.add_domain(domain)

Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: dcc482ab068f3e2527755562cc1c17ff
config: 8b8c7260a070827b00291bef99cea017
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/build/html/.doctrees/classes/spatialpy.core.doctree
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/spatialpy.doctree
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/spatialpy.solvers.doctree
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/spatialpy.stochss.doctree
Binary file not shown.
Binary file modified docs/build/html/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/build/html/.doctrees/index.doctree
Binary file not shown.
11 changes: 5 additions & 6 deletions docs/build/html/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &#8212; SpatialPy 1.0.2 documentation</title>
<title>Overview: module code &#8212; SpatialPy 1.1.0 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../_static/alabaster.css" />
<link rel="stylesheet" type="text/css" href="../_static/css/spatialpy_alabaster_customizations.css" />
Expand Down Expand Up @@ -89,22 +89,21 @@ <h3 id="searchlabel">Quick search</h3>
<div class="body" role="main">

<h1>All modules for which code is available</h1>
<ul><li><a href="collections.html">collections</a></li>
<li><a href="itertools.html">itertools</a></li>
<li><a href="plotly/offline/offline.html">plotly.offline.offline</a></li>
<li><a href="scipy/spatial/kdtree.html">scipy.spatial.kdtree</a></li>
<li><a href="spatialpy/core/boundarycondition.html">spatialpy.core.boundarycondition</a></li>
<ul><li><a href="spatialpy/core/boundarycondition.html">spatialpy.core.boundarycondition</a></li>
<li><a href="spatialpy/core/cleanup.html">spatialpy.core.cleanup</a></li>
<li><a href="spatialpy/core/datafunction.html">spatialpy.core.datafunction</a></li>
<li><a href="spatialpy/core/domain.html">spatialpy.core.domain</a></li>
<li><a href="spatialpy/core/geometry.html">spatialpy.core.geometry</a></li>
<li><a href="spatialpy/core/initialcondition.html">spatialpy.core.initialcondition</a></li>
<li><a href="spatialpy/core/lattice.html">spatialpy.core.lattice</a></li>
<li><a href="spatialpy/core/model.html">spatialpy.core.model</a></li>
<li><a href="spatialpy/core/parameter.html">spatialpy.core.parameter</a></li>
<li><a href="spatialpy/core/reaction.html">spatialpy.core.reaction</a></li>
<li><a href="spatialpy/core/result.html">spatialpy.core.result</a></li>
<li><a href="spatialpy/core/spatialpyerror.html">spatialpy.core.spatialpyerror</a></li>
<li><a href="spatialpy/core/species.html">spatialpy.core.species</a></li>
<li><a href="spatialpy/core/timespan.html">spatialpy.core.timespan</a></li>
<li><a href="spatialpy/core/transformation.html">spatialpy.core.transformation</a></li>
<li><a href="spatialpy/core/visualization.html">spatialpy.core.visualization</a></li>
<li><a href="spatialpy/core/vtkreader.html">spatialpy.core.vtkreader</a></li>
<li><a href="spatialpy/solvers/build_expression.html">spatialpy.solvers.build_expression</a></li>
Expand Down
38 changes: 20 additions & 18 deletions docs/build/html/_modules/spatialpy/core/boundarycondition.html

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/build/html/_modules/spatialpy/core/cleanup.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spatialpy.core.cleanup &#8212; SpatialPy 1.0.2 documentation</title>
<title>spatialpy.core.cleanup &#8212; SpatialPy 1.1.0 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../../_static/alabaster.css" />
<link rel="stylesheet" type="text/css" href="../../../_static/css/spatialpy_alabaster_customizations.css" />
Expand Down Expand Up @@ -127,7 +127,7 @@ <h1>Source code for spatialpy.core.cleanup</h1><div class="highlight"><pre>
<span class="sd">&#39;&#39;&#39;</span>
<span class="sd"> Cleanup all tempfiles in spatialpy core.</span>
<span class="sd"> &#39;&#39;&#39;</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="kn">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="k">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>

<span class="n">tempdir</span> <span class="o">=</span> <span class="n">tempfile</span><span class="o">.</span><span class="n">gettempdir</span><span class="p">()</span>
<span class="n">core_dir</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">tempdir</span><span class="p">,</span> <span class="s2">&quot;spatialpy_core&quot;</span><span class="p">)</span>
Expand All @@ -142,7 +142,7 @@ <h1>Source code for spatialpy.core.cleanup</h1><div class="highlight"><pre>
<span class="sd"> :param build_dir: Path to the build directory to be removed. (optional)</span>
<span class="sd"> :type build_dir: string</span>
<span class="sd"> &#39;&#39;&#39;</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="kn">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="k">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>

<span class="k">if</span> <span class="n">build_dir</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">shutil</span><span class="o">.</span><span class="n">rmtree</span><span class="p">(</span><span class="n">build_dir</span><span class="p">)</span>
Expand All @@ -164,7 +164,7 @@ <h1>Source code for spatialpy.core.cleanup</h1><div class="highlight"><pre>
<span class="sd"> :param result_dir: Path to the result directory to be removed. (optional)</span>
<span class="sd"> :type result_dir: string</span>
<span class="sd"> &#39;&#39;&#39;</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="kn">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>
<span class="kn">from</span> <span class="nn">spatialpy.core</span> <span class="k">import</span> <span class="n">log</span> <span class="c1"># pylint: disable=import-outside-toplevel</span>

<span class="k">if</span> <span class="n">result_dir</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">shutil</span><span class="o">.</span><span class="n">rmtree</span><span class="p">(</span><span class="n">result_dir</span><span class="p">)</span>
Expand Down
8 changes: 4 additions & 4 deletions docs/build/html/_modules/spatialpy/core/datafunction.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>spatialpy.core.datafunction &#8212; SpatialPy 1.0.2 documentation</title>
<title>spatialpy.core.datafunction &#8212; SpatialPy 1.1.0 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../_static/pygments.css" />
<link rel="stylesheet" type="text/css" href="../../../_static/alabaster.css" />
<link rel="stylesheet" type="text/css" href="../../../_static/css/spatialpy_alabaster_customizations.css" />
Expand Down Expand Up @@ -106,7 +106,7 @@ <h1>Source code for spatialpy.core.datafunction</h1><div class="highlight"><pre>

<span class="c1"># You should have received a copy of the GNU General Public License</span>
<span class="c1"># along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span>
<span class="kn">from</span> <span class="nn">spatialpy.core.spatialpyerror</span> <span class="kn">import</span> <span class="n">DataFunctionError</span>
<span class="kn">from</span> <span class="nn">spatialpy.core.spatialpyerror</span> <span class="k">import</span> <span class="n">DataFunctionError</span>

<div class="viewcode-block" id="DataFunction"><a class="viewcode-back" href="../../../classes/spatialpy.core.html#spatialpy.core.datafunction.DataFunction">[docs]</a><span class="k">class</span> <span class="nc">DataFunction</span><span class="p">():</span>
<span class="sd">&quot;&quot;&quot;</span>
Expand All @@ -118,7 +118,7 @@ <h1>Source code for spatialpy.core.datafunction</h1><div class="highlight"><pre>
<span class="sd"> :raises DataFunctionError: If a name is not provided.</span>
<span class="sd"> &quot;&quot;&quot;</span>

<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
<span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">name</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
<span class="k">if</span> <span class="n">name</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="o">=</span> <span class="n">name</span>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">name</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
Expand All @@ -137,7 +137,7 @@ <h1>Source code for spatialpy.core.datafunction</h1><div class="highlight"><pre>
<span class="sd"> :returns: Value of function at this spatial location.</span>
<span class="sd"> :rtype: float</span>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="k">raise</span> <span class="n">DataFunctionError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">name</span><span class="si">}</span><span class="s2">: DataFunction.map() must be implemented.&quot;</span><span class="p">)</span></div></div>
<span class="k">raise</span> <span class="n">DataFunctionError</span><span class="p">(</span><span class="n">f</span><span class="s2">&quot;</span><span class="si">{self.name}</span><span class="s2">: DataFunction.map() must be implemented.&quot;</span><span class="p">)</span></div></div>
</pre></div>

</div>
Expand Down
Loading