Skip to content

Commit

Permalink
Merge pull request #931 from StochSS/develop
Browse files Browse the repository at this point in the history 
1.8.2 Release
  • Loading branch information
@briandrawert
briandrawert committed Apr 27, 2023
2 parents 662926a + ae9fd73 commit de40702
Show file tree
Hide file tree
Showing 88 changed files with 1,556 additions and 295 deletions.
2 changes: 1 addition & 1 deletion docs/build/html/.buildinfo
View file
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: 714161441d2f0842325605e90e4c0783
config: 6224f6c27785099ae9bf97ec5ae27f60
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/build/html/.doctrees/classes/gillespy2.core.doctree
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/gillespy2.solvers.cpp.doctree
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/gillespy2.solvers.doctree
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/gillespy2.solvers.numpy.doctree
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/classes/gillespy2.stochss.doctree
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/build/html/.doctrees/index.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/assignmentrule.html
View file
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>gillespy2.core.assignmentrule &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.assignmentrule &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/cleanup.html
View file
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>gillespy2.core.cleanup &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.cleanup &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/events.html
View file
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>gillespy2.core.events &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.events &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/functiondefinition.html
View file
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>gillespy2.core.functiondefinition &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.functiondefinition &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/gillespyError.html
View file
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>gillespy2.core.gillespyError &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.gillespyError &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/gillespySolver.html
View file
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>gillespy2.core.gillespySolver &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.gillespySolver &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/jsonify.html
View file
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>gillespy2.core.jsonify &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.jsonify &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/liveGraphing.html
View file
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>gillespy2.core.liveGraphing &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.liveGraphing &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
24 changes: 21 additions & 3 deletions docs/build/html/_modules/gillespy2/core/model.html
View file
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>gillespy2.core.model &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.model &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down Expand Up @@ -175,10 +175,14 @@ <h1>Source code for gillespy2.core.model</h1><div class="highlight"><pre>
<span class="k">except</span> <span class="ne">ImportError</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ImportError</span><span class="p">(</span><span class="s1">&#39;SBML conversion not imported successfully&#39;</span><span class="p">)</span> <span class="kn">from</span> <span class="nn">err</span>

<span class="k">return</span> <span class="n">convert</span><span class="p">(</span>
<span class="p">(</span><span class="n">model</span><span class="p">,</span><span class="n">errs</span><span class="p">)</span> <span class="o">=</span> <span class="n">convert</span><span class="p">(</span>
<span class="n">filename</span><span class="p">,</span> <span class="n">model_name</span><span class="o">=</span><span class="n">name</span><span class="p">,</span> <span class="n">gillespy_model</span><span class="o">=</span><span class="n">gillespy_model</span><span class="p">,</span>
<span class="n">report_silently_with_sbml_error</span><span class="o">=</span><span class="n">report_silently_with_sbml_error</span>
<span class="p">)</span></div>
<span class="p">)</span>
<span class="k">if</span> <span class="n">model</span><span class="o">.</span><span class="n">tspan</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">model</span><span class="o">.</span><span class="n">timespan</span><span class="p">(</span><span class="n">gillespy2</span><span class="o">.</span><span class="n">TimeSpan</span><span class="o">.</span><span class="n">linspace</span><span class="p">(</span><span class="n">t</span><span class="o">=</span><span class="mi">1</span><span class="p">))</span>

<span class="k">return</span> <span class="p">(</span><span class="n">model</span><span class="p">,</span> <span class="n">errs</span><span class="p">)</span></div>


<div class="viewcode-block" id="export_SBML"><a class="viewcode-back" href="../../../classes/gillespy2.core.html#gillespy2.core.model.export_SBML">[docs]</a><span class="k">def</span> <span class="nf">export_SBML</span><span class="p">(</span><span class="n">gillespy_model</span><span class="p">,</span> <span class="n">filename</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
Expand Down Expand Up @@ -318,6 +322,8 @@ <h1>Source code for gillespy2.core.model</h1><div class="highlight"><pre>
<span class="n">print_string</span> <span class="o">+=</span> <span class="n">decorate</span><span class="p">(</span><span class="s1">&#39;Species&#39;</span><span class="p">)</span>
<span class="k">for</span> <span class="n">species</span> <span class="ow">in</span> <span class="nb">sorted</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">listOfSpecies</span><span class="o">.</span><span class="n">values</span><span class="p">()):</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="s1">&#39;</span><span class="se">\n</span><span class="s1">&#39;</span> <span class="o">+</span> <span class="nb">str</span><span class="p">(</span><span class="n">species</span><span class="p">)</span>
<span class="k">if</span> <span class="n">species</span><span class="o">.</span><span class="n">mode</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="s1">&#39; (&#39;</span> <span class="o">+</span> <span class="n">species</span><span class="o">.</span><span class="n">mode</span> <span class="o">+</span> <span class="s1">&#39;)&#39;</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">listOfParameters</span><span class="p">):</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="n">decorate</span><span class="p">(</span><span class="s1">&#39;Parameters&#39;</span><span class="p">)</span>
<span class="k">for</span> <span class="n">parameter</span> <span class="ow">in</span> <span class="nb">sorted</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">listOfParameters</span><span class="o">.</span><span class="n">values</span><span class="p">()):</span>
Expand Down Expand Up @@ -345,6 +351,8 @@ <h1>Source code for gillespy2.core.model</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">tspan</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="n">decorate</span><span class="p">(</span><span class="s1">&#39;Timespan&#39;</span><span class="p">)</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">tspan</span><span class="p">)</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">print_string</span> <span class="o">+=</span> <span class="n">decorate</span><span class="p">(</span><span class="s1">&#39;No Timespan found&#39;</span><span class="p">)</span>
<span class="k">return</span> <span class="n">print_string</span>

<span class="k">def</span> <span class="fm">__getitem__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">):</span>
Expand Down Expand Up @@ -1395,6 +1403,16 @@ <h1>Source code for gillespy2.core.model</h1><div class="highlight"><pre>
<span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
<span class="k">raise</span> <span class="n">SimulationError</span><span class="p">(</span><span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">solver</span><span class="si">}</span><span class="s2"> is not a valid solver. Reason Given: </span><span class="si">{</span><span class="n">err</span><span class="si">}</span><span class="s2">.&quot;</span><span class="p">)</span> <span class="kn">from</span> <span class="nn">err</span>

<span class="k">if</span> <span class="s2">&quot;integrator&quot;</span> <span class="ow">in</span> <span class="n">solver_args</span><span class="p">:</span>
<span class="k">raise</span> <span class="n">SimulationError</span><span class="p">(</span>
<span class="sa">f</span><span class="s2">&quot;&quot;&quot;</span>
<span class="s2"> The integrator argument to run is only supported by the ODESolver.run method. To use the integrator use:</span>

<span class="s2"> solver = gillespy2.ODESolver(model=model)</span>
<span class="s2"> results = solver.run(integrator=&#39;</span><span class="si">{</span><span class="n">solver_args</span><span class="p">[</span><span class="s1">&#39;integrator&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">&#39;)</span>
<span class="s2"> &quot;&quot;&quot;</span>
<span class="p">)</span>

<span class="k">try</span><span class="p">:</span>
<span class="k">return</span> <span class="n">solver</span><span class="o">.</span><span class="n">run</span><span class="p">(</span><span class="n">t</span><span class="o">=</span><span class="n">t</span><span class="p">,</span> <span class="n">increment</span><span class="o">=</span><span class="n">increment</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="n">timeout</span><span class="p">,</span> <span class="o">**</span><span class="n">solver_args</span><span class="p">)</span>
<span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">err</span><span class="p">:</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/build/html/_modules/gillespy2/core/parameter.html
View file
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>gillespy2.core.parameter &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.parameter &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down Expand Up @@ -225,7 +225,7 @@ <h1>Source code for gillespy2.core.parameter</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="n">expression</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
<span class="k">raise</span> <span class="n">ParameterError</span><span class="p">(</span><span class="s2">&quot;initial_value can&#39;t be None type.&quot;</span><span class="p">)</span>
<span class="k">if</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
<span class="k">raise</span> <span class="n">ParameterError</span><span class="p">(</span><span class="s2">&quot;expression must be of type str, float, or int.&quot;</span><span class="p">)</span>
<span class="k">raise</span> <span class="n">ParameterError</span><span class="p">(</span><span class="s2">&quot;expression must be of type str.&quot;</span><span class="p">)</span>
<span class="k">if</span> <span class="n">expression</span> <span class="o">==</span> <span class="s2">&quot;&quot;</span><span class="p">:</span>
<span class="k">raise</span> <span class="n">ParameterError</span><span class="p">(</span><span class="s2">&quot;expression can&#39;t be an empty string.&quot;</span><span class="p">)</span></div></div>
</pre></div>
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/raterule.html
View file
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>gillespy2.core.raterule &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.raterule &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down
2 changes: 1 addition & 1 deletion docs/build/html/_modules/gillespy2/core/reaction.html
View file
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>gillespy2.core.reaction &#8212; GillesPy2 1.8.1 documentation</title>
<title>gillespy2.core.reaction &#8212; GillesPy2 1.8.2 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/gillespy2_alabaster_customizations.css" />
Expand Down

0 comments on commit de40702

Please sign in to comment.