Skip to content

Commit

Permalink
catching up with remote changes
Browse files Browse the repository at this point in the history
  • Loading branch information
j-c-gibson committed Dec 4, 2024
2 parents 0889ae6 + 8392bdc commit 20e0fd0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion docs/notebooks/definition.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
"outputs": [],
"source": [
"from graphviz import Digraph\n",
"import dot2tex\n",
"\n",
"\n",
"dot = Digraph()\n",
Expand Down
1 change: 0 additions & 1 deletion docs/notebooks/solution.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"outputs": [],
"source": [
"from graphviz import Digraph\n",
"import dot2tex\n",
"\n",
"\n",
"dot = Digraph()\n",
Expand Down
5 changes: 4 additions & 1 deletion src/pygom/model/base_ode_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,10 @@ def parameters(self):
"""
if not hasattr(self, "_parameters"):
return None
<<<<<<< HEAD

=======
>>>>>>> 8392bdc583652db66b54b5e7b7ccd4868a6607c4
return self._parameters

@parameters.setter
Expand Down Expand Up @@ -1503,4 +1506,4 @@ def _extractUpperTriangle(self, A, nrow=None, ncol=None):
for j in range(i, ncol):
B[i,j] = A[i, j]

return B
return B

0 comments on commit 20e0fd0

Please sign in to comment.