Skip to content

Commit

Permalink
Merge pull request #14 from tvdboom/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
tvdboom authored Sep 28, 2021
2 parents 14fb348 + 4aaa387 commit 93c7286
Show file tree
Hide file tree
Showing 317 changed files with 13,826 additions and 11,696 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
Overview
--------

Author: [Mavs](https://github.com/tvdboom)
<a href="https://github.com/tvdboom" style="text-decoration: none" draggable="false"><img src="./docs_sources/img/icons/avatar.png" alt="Author" height=13 width=13 draggable="false" /> Mavs</a>
&nbsp;&nbsp;&nbsp;&nbsp;
Email: m.524687@gmail.com
<a href="mailto:m.524687@gmail.com" style="text-decoration: none" draggable="false"><img src="./docs_sources/img/icons/email.png" alt="Email" height=12 width=15 draggable="false" /> m.524687@gmail.com</a>
&nbsp;&nbsp;&nbsp;&nbsp;
Documentation: [https://tvdboom.github.io/ATOM/](https://tvdboom.github.io/ATOM/)<br>
Slack: [https://join.slack.com/t/atom-alm7229/shared_invite/zt-upd8uc0z-LL63MzBWxFf5tVWOGCBY5g](https://join.slack.com/t/atom-alm7229/shared_invite/zt-upd8uc0z-LL63MzBWxFf5tVWOGCBY5g)
<a href="https://tvdboom.github.io/ATOM/" style="text-decoration: none" draggable="false"><img src="./docs_sources/img/icons/documentation.png" alt="Documentation" height=14 width=14 draggable="false" /> Documentation</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="https://join.slack.com/t/atom-alm7229/shared_invite/zt-upd8uc0z-LL63MzBWxFf5tVWOGCBY5g" style="text-decoration: none" draggable="false"><img src="./docs_sources/img/icons/slack.png" alt="Slack" height=14 width=14 draggable="false"/> Slack</a>


#### Repository:
Expand Down
2 changes: 1 addition & 1 deletion atom/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@

from .api import ATOMClassifier, ATOMRegressor, ATOMLoader, ATOMModel

__version__ = "4.7.3"
__version__ = "4.8.0"
13 changes: 5 additions & 8 deletions atom/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,11 @@ def ATOMLoader(
custom_transform(cls, est1, branch, verbose=verbose)

for b2, v2 in cls._branches.items():
try: # Can fail if pipeline is shorter than i
if b1 != b2 and est1 is v2.pipeline.iloc[i]:
# Update the data and step for the other branch
cls._branches[b2].data = copy(branch.data)
cls._branches[b2].idx = copy(branch.idx)
step[b2] = i
except IndexError:
continue
if b1 != b2 and v2.pipeline.get(i) is est1:
# Update the data and step for the other branch
cls._branches[b2].data = copy(branch.data)
cls._branches[b2].idx = copy(branch.idx)
step[b2] = i

cls.log(f"{cls.__class__.__name__} loaded successfully!", 1)

Expand Down
Loading

0 comments on commit 93c7286

Please sign in to comment.