Skip to content

Commit e5c54a9

Browse files
authored
Merge pull request #50 from mikofski/datalayer_args
refactor layers to remove redundancy * layers are plural: `Calculations`, `Simulations`, `Formulas`, except `Data` layer * layers are made from sources * sources are singular: `Calc`, `Simulation`, `Formula`, except `DataSource` * add `add()`, `edit()` and `delete()` methods to superclass * add `reg_cls` class attirbute to super class, to be set by subclasses * add `sources`, `reg` and `objects` to superclass
2 parents 51fd9aa + e9331c0 commit e5c54a9

6 files changed

Lines changed: 135 additions & 156 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.pydevproject
66
.settings/
77
.idea/
8+
.spyderproject
89

910
# build
1011
*.pyc

carousel/core/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
calculators, simulations is accomplished by sub-classing the appropriate
66
class.
77
8-
The built-in classes are organized into 5 sections, which make up the layers
8+
The built-in classes are organized into 5 categories, which make up the layers
99
of a model.
1010
1111
* Data

carousel/core/formulas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def import_formulas(self):
5757
"""
5858
This method must be implemented by each formula importer.
5959
60-
:returns: Formulas.
60+
:returns: formulas
6161
:rtype: dict
6262
:raises: :exc:`~exceptions.NotImplementedError`
6363
"""

0 commit comments

Comments
 (0)