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.

Sign up for GitHub

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

Jump to bottom

Make sure model_description always returns a Model instance #112

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Make sure model_description always returns a Model instance #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions formulae/model_description.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from .scanner import Scanner
from .parser import Parser
from .resolver import Resolver
from formulae.terms.terms import Model

from formulae.scanner import Scanner
from formulae.parser import Parser
from formulae.resolver import Resolver


def model_description(formula):
Expand All @@ -19,4 +21,10 @@ def model_description(formula):
----------
An object of class ModelTerms with an internal description of the model.
"""
return Resolver(Parser(Scanner(formula).scan()).parse()).resolve()

description = Resolver(Parser(Scanner(formula).scan()).parse()).resolve()

if isinstance(description, Model):
return description

return Model(description)
Loading