Skip to content

FIX: ActiveAx issue #211

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

Open
nightwnvol wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FIX: ActiveAx issue #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f1f761
fix: remove isExvivo parameter from CylinderZeppelinBall model
nightwnvol Dec 15, 2025
296a296
docs: update CHANGELOG.md
nightwnvol Dec 15, 2025
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Change Log
### All notable changes to `AMICO` will be documented in this file.

## [Unreleased]
### 🐛Fixed
- Removed `isExvivo` parameter from CylinderZeppelinBall model

---
---

## `v2.1.1`<br>_2025-08-13_
### 🐛Fixed
- `UserWarning`: `pkg_resources` is deprecated as an API.
Expand Down
5 changes: 0 additions & 5 deletions amico/models.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ class CylinderZeppelinBall( BaseModel ) :
params['Rs'] = self.Rs
params['d_perps'] = self.d_perps
params['d_isos'] = self.d_isos
params['isExvivo'] = self.isExvivo
return params


Expand Down Expand Up @@ -546,16 +545,12 @@ class CylinderZeppelinBall( BaseModel ) :
def _fit(self, thread_id, y, dirs, hash_table, kernels):
# configs
cdef int thread_id_c = thread_id
cdef bint is_exvivo = 1 if self.isExvivo else 0
cdef bint compute_rmse = 1 if self.configs['compute_rmse'] else 0
cdef bint compute_nrmse = 1 if self.configs['compute_nrmse'] else 0
cdef int n_rs = len(self.Rs)
cdef int n_perp = len(self.d_perps)
cdef int n_iso = len(self.d_isos)
cdef int n_atoms = n_rs + n_perp + n_iso
# NOTE not implemented
if is_exvivo:
n_atoms += 1

# solver params
cdef double lambda1 = self.solver_params['lambda1']
Expand Down