diff --git a/CodeEntropy/entropy/workflow.py b/CodeEntropy/entropy/workflow.py index b35e259..75115cd 100644 --- a/CodeEntropy/entropy/workflow.py +++ b/CodeEntropy/entropy/workflow.py @@ -96,7 +96,7 @@ def execute(self) -> None: This orchestrates the complete entropy pipeline: 1. Build trajectory slice. - 2. Apply atom selection to create a reduced universe. + 2. Apply atom and frame selection to create a reduced universe. 3. Detect hierarchy levels. 4. Group molecules. 5. Split groups into water and non-water. @@ -233,21 +233,31 @@ def _get_number_frames(self, start: int, end: int, step: int) -> int: return math.floor((end - start) / step) def _build_reduced_universe(self) -> Any: - """Apply atom selection and return the reduced universe. - - If `selection_string` is "all", the original universe is returned. + """Apply atom and frame selection and return the reduced universe. Returns: - MDAnalysis Universe (original or reduced). + MDAnalysis Universe (reduced according to user selections). """ selection = self._args.selection_string + start = self._args.start + end = len(self._universe.trajectory) if self._args.end == -1 else self._args.end + step = self._args.step if selection == "all": - return self._universe + reduced_atoms = self._universe + else: + reduced_atoms = self._universe_operations.select_atoms( + self._universe, selection + ) + name = f"{len(reduced_atoms.trajectory)}_frame_dump_atom_selection" + self._run_manager.write_universe(reduced_atoms, name) + + reduced_frames = self._universe_operations.select_frames( + reduced_atoms, start, end, step + ) + name = f"{len(reduced_frames.trajectory)}_frame_dump_frame_selection" + self._run_manager.write_universe(reduced_frames, name) - reduced = self._universe_operations.select_atoms(self._universe, selection) - name = f"{len(reduced.trajectory)}_frame_dump_atom_selection" - self._run_manager.write_universe(reduced, name) - return reduced + return reduced_frames def _detect_levels(self, reduced_universe: Any) -> Any: """Detect hierarchy levels for each molecule in the reduced universe. diff --git a/CodeEntropy/levels/dihedrals.py b/CodeEntropy/levels/dihedrals.py index 0b40278..0c5073a 100644 --- a/CodeEntropy/levels/dihedrals.py +++ b/CodeEntropy/levels/dihedrals.py @@ -39,9 +39,6 @@ def build_conformational_states( data_container: Any, levels: dict[Any, list[str]], groups: dict[int, list[Any]], - start: int, - end: int, - step: int, bin_width: float, progress: _RichProgressSink | None = None, ) -> tuple[dict[UAKey, list[str]], list[list[str]], dict[UAKey, int], list[int]]: @@ -62,9 +59,6 @@ def build_conformational_states( levels: Mapping of molecule_id -> iterable of enabled level names (e.g., ["united_atom", "residue"]). groups: Mapping of group_id -> list of molecule_ids. - start: Inclusive start frame index. - end: Exclusive end frame index. - step: Frame stride. bin_width: Histogram bin width in degrees used when identifying peak dihedral populations. progress: Optional progress sink (e.g., from @@ -81,14 +75,14 @@ def build_conformational_states( Notes: - This function advances progress once per group_id. - - Frame slicing arguments (start/end/step) are forwarded to downstream helpers as implemented in this module. """ number_groups = len(groups) states_ua: dict[UAKey, list[str]] = {} + # states_res: list[list[str]] = [[]] states_res: list[list[str]] = [[] for _ in range(number_groups)] flexible_ua: dict[UAKey, int] = {} - flexible_res: list[int] = [0] * number_groups + flexible_res: list[int] = [] task: TaskID | None = None if progress is not None: @@ -116,39 +110,20 @@ def build_conformational_states( if progress is not None and task is not None: progress.update(task, title=f"Group {group_id}") - mol = self._universe_operations.extract_fragment( - data_container, molecules[0] - ) - - dihedrals_ua, dihedrals_res = self._collect_dihedrals_for_group( - mol=mol, - level_list=levels[molecules[0]], - ) - - peaks_ua, peaks_res = self._collect_peaks_for_group( + peaks_ua, peaks_res = self._identify_peaks( data_container=data_container, molecules=molecules, - dihedrals_ua=dihedrals_ua, - dihedrals_res=dihedrals_res, bin_width=bin_width, - start=start, - end=end, - step=step, level_list=levels[molecules[0]], ) - self._assign_states_for_group( + self._assign_states( data_container=data_container, group_id=group_id, molecules=molecules, - dihedrals_ua=dihedrals_ua, + level_list=levels[molecules[0]], peaks_ua=peaks_ua, - dihedrals_res=dihedrals_res, peaks_res=peaks_res, - start=start, - end=end, - step=step, - level_list=levels[molecules[0]], states_ua=states_ua, states_res=states_res, flexible_ua=flexible_ua, @@ -158,36 +133,12 @@ def build_conformational_states( if progress is not None and task is not None: progress.advance(task) - return states_ua, states_res, flexible_ua, flexible_res - - def _collect_dihedrals_for_group( - self, mol: Any, level_list: list[str] - ) -> tuple[list[list[Any]], list[Any]]: - """Collect UA and residue dihedral AtomGroups for a group. - - Args: - mol: Representative molecule AtomGroup. - level_list: List of enabled hierarchy levels. - - Returns: - Tuple: - dihedrals_ua: List of per-residue dihedral AtomGroups. - dihedrals_res: List of residue-level dihedral AtomGroups. - """ - num_residues = len(mol.residues) - dihedrals_ua: list[list[Any]] = [[] for _ in range(num_residues)] - dihedrals_res: list[Any] = [] + logger.debug(f"States UA: {states_ua}") + logger.debug(f"Number of flexible dihedrals UA: {flexible_ua}") + logger.debug(f"States Res: {states_res}") + logger.debug(f"Number of flexible dihedrals Res: {flexible_res}") - for level in level_list: - if level == "united_atom": - for res_id in range(num_residues): - heavy_res = self._select_heavy_residue(mol, res_id) - dihedrals_ua[res_id] = self._get_dihedrals(heavy_res, level) - - elif level == "residue": - dihedrals_res = self._get_dihedrals(mol, level) - - return dihedrals_ua, dihedrals_res + return states_ua, states_res, flexible_ua, flexible_res def _select_heavy_residue(self, mol: Any, res_id: int) -> Any: """Select heavy atoms in a residue by residue index. @@ -245,113 +196,159 @@ def _get_dihedrals(self, data_container: Any, level: str) -> list[Any]: logger.debug(f"Level: {level}, Dihedrals: {atom_groups}") return atom_groups - def _collect_peaks_for_group( + def _identify_peaks( self, data_container: Any, molecules: list[Any], - dihedrals_ua: list[list[Any]], - dihedrals_res: list[Any], bin_width: float, - start: int, - end: int, - step: int, - level_list: list[str], - ) -> tuple[list[list[Any]], list[Any]]: - """Compute histogram peaks for UA and residue dihedral sets. + level_list: list[Any], + ) -> list[list[float]]: + """Identify histogram peaks ("convex turning points") for each dihedral. + + Important: + This function intentionally preserves the legacy behavior: + it samples over the full trajectory length for each molecule + and does not apply start/end/step to the Dihedral run. + + Args: + data_container: MDAnalysis universe. + molecules: Molecule ids in the group. + levels: Molecule levels. + bin_width: Histogram bin width (degrees). Returns: - Tuple: - peaks_ua: list of peaks per residue - (each item is list-of-peaks per dihedral) - peaks_res: list-of-peaks per dihedral for residue level (or []) + List of peaks per dihedral (peak_values[dihedral_index] -> list of peaks). """ - peaks_ua: list[list[Any]] = [[] for _ in range(len(dihedrals_ua))] + rep_mol = self._universe_operations.extract_fragment(data_container, 0) + number_frames = len(rep_mol.trajectory) + num_residues = len(rep_mol.residues) + + num_dihedrals_ua: list[Any] = [0 for _ in range(num_residues)] + phi_ua = {} + phi_res: dict[list, list[float]] = {} + peaks_ua: list[list[Any]] = [[] for _ in range(num_residues)] peaks_res: list[Any] = [] + for molecule in molecules: + mol = self._universe_operations.extract_fragment(data_container, molecule) + + for level in level_list: + if level == "united_atom": + for res_id in range(num_residues): + heavy_res = self._select_heavy_residue(mol, res_id) + dihedrals = self._get_dihedrals(heavy_res, level) + num_dihedrals_ua[res_id] = len(dihedrals) + if num_dihedrals_ua[res_id] == 0: + # No dihedrals, no peaks + phi_ua[res_id] = [] + + else: + if res_id not in phi_ua: + phi_ua[res_id] = {} + dihedral_results = Dihedral(dihedrals).run() + phi_ua[res_id] = self._process_dihedral_phi( + dihedral_results, + num_dihedrals_ua[res_id], + number_frames, + phi_ua[res_id], + ) + + elif level == "residue": + dihedrals = self._get_dihedrals(mol, level) + num_dihedrals_res = len(dihedrals) + if num_dihedrals_res == 0: + # No dihedrals, no peaks + phi_res = [] + + else: + dihedral_results = Dihedral(dihedrals).run() + phi_res = self._process_dihedral_phi( + dihedral_results, + num_dihedrals_res, + number_frames, + phi_res, + ) + + logger.debug(f"phi_ua {phi_ua}") + logger.debug(f"phi_res {phi_res}") + for level in level_list: if level == "united_atom": - for res_id in range(len(dihedrals_ua)): - if len(dihedrals_ua[res_id]) == 0: - # No dihedrals means no peaks + for res_id in range(num_residues): + if phi_ua[res_id] is None: peaks_ua[res_id] = [] else: - peaks_ua[res_id] = self._identify_peaks( - data_container=data_container, - molecules=molecules, - dihedrals=dihedrals_ua[res_id], - bin_width=bin_width, - start=start, - end=end, - step=step, + peaks_ua[res_id] = self._process_histogram( + num_dihedrals_ua[res_id], phi_ua[res_id], bin_width ) elif level == "residue": - if len(dihedrals_res) == 0: - # No dihedrals means no peaks + if phi_res is None: peaks_res = [] else: - peaks_res = self._identify_peaks( - data_container=data_container, - molecules=molecules, - dihedrals=dihedrals_res, - bin_width=bin_width, - start=start, - end=end, - step=step, + peaks_res = self._process_histogram( + num_dihedrals_res, phi_res, bin_width ) return peaks_ua, peaks_res - def _identify_peaks( + def _process_dihedral_phi( self, - data_container: Any, - molecules: list[Any], - dihedrals: list[Any], - bin_width: float, - start: int, - end: int, - step: int, - ) -> list[list[float]]: - """Identify histogram peaks ("convex turning points") for each dihedral. - - Important: - This function intentionally preserves the legacy behavior: - it samples over the full trajectory length for each molecule - and does not apply start/end/step to the Dihedral run. + dihedral_results, + num_dihedrals, + number_frames, + phi_values, + ): + """ + Find array of dihedral angle values. Args: - data_container: MDAnalysis universe. - molecules: Molecule ids in the group. - dihedrals: Dihedral AtomGroups. - bin_width: Histogram bin width (degrees). - start: Unused in legacy sampling. - end: Unused in legacy sampling. - step: Unused in legacy sampling. + dihedral_results: the result of MDAnalysis Dihedrals.run. + num_dihedrals: the number of dihedrals in the molecule or residue. Returns: - List of peaks per dihedral (peak_values[dihedral_index] -> list of peaks). + peaks """ - peak_values: list[list[float]] = [] - - for dihedral_index in range(len(dihedrals)): + for dihedral_index in range(num_dihedrals): phi: list[float] = [] - for molecule in molecules: - mol = self._universe_operations.extract_fragment( - data_container, molecule - ) - number_frames = len(mol.trajectory) + for timestep in range(number_frames): + value = dihedral_results.results.angles[timestep][dihedral_index] + if value < 0: + value += 360 + phi.append(float(value)) - dihedral_results = Dihedral(dihedrals).run() + if dihedral_index not in phi_values: + phi_values[dihedral_index] = phi + else: + phi_values[dihedral_index].extend(phi) - for timestep in range(number_frames): - value = dihedral_results.results.angles[timestep][dihedral_index] - if value < 0: - value += 360 - phi.append(float(value)) + return phi_values + def _process_histogram( + self, + num_dihedrals, + phi_values, + bin_width, + ): + """ + Find peaks from array of dihedral angle values. + + Args: + dihedral_results: the result of MDAnalysis Dihedrals.run. + num_dihedrals: the number of dihedrals in the molecule or residue. + + Returns: + peaks + """ + peak_values = [] + for dihedral_index in range(num_dihedrals): + phi = phi_values[dihedral_index] number_bins = int(360 / bin_width) popul, bin_edges = np.histogram(a=phi, bins=number_bins, range=(0, 360)) + + logger.debug(f"Histogram: {popul}") + bin_value = [ 0.5 * (bin_edges[i] + bin_edges[i + 1]) for i in range(0, len(popul)) ] @@ -359,9 +356,7 @@ def _identify_peaks( peaks = self._find_histogram_peaks(popul=popul, bin_value=bin_value) peak_values.append(peaks) - logger.debug( - f"Dihedral: {dihedral_index}Peak Values: {peak_values[dihedral_index]}" - ) + logger.debug(f"Dihedral: {dihedral_index} Peaks: {peaks}") return peak_values @@ -397,67 +392,18 @@ def _find_histogram_peaks( return peaks - def _assign_states_for_group( + def _assign_states( self, data_container: Any, group_id: int, molecules: list[Any], - dihedrals_ua: list[list[Any]], + level_list: list[Any], peaks_ua: list[list[Any]], - dihedrals_res: list[Any], peaks_res: list[Any], - start: int, - end: int, - step: int, - level_list: list[str], - states_ua: dict[UAKey, list[str]], - states_res: list[list[str]], - flexible_ua: dict[UAKey, list[int]], - flexible_res: list[int], - ) -> None: - """Assign UA and residue states for a group into output containers.""" - for level in level_list: - if level == "united_atom": - for res_id in range(len(dihedrals_ua)): - key = (group_id, res_id) - if len(dihedrals_ua[res_id]) == 0: - states_ua[key] = [] - flexible_ua[key] = 0 - else: - states_ua[key], flexible_ua[key] = self._assign_states( - data_container=data_container, - molecules=molecules, - dihedrals=dihedrals_ua[res_id], - peaks=peaks_ua[res_id], - start=start, - end=end, - step=step, - ) - - elif level == "residue": - if len(dihedrals_res) == 0: - states_res[group_id] = [] - flexible_res[group_id] = 0 - else: - states_res[group_id], flexible_res[group_id] = self._assign_states( - data_container=data_container, - molecules=molecules, - dihedrals=dihedrals_res, - peaks=peaks_res, - start=start, - end=end, - step=step, - ) - - def _assign_states( - self, - data_container: Any, - molecules: list[Any], - dihedrals: list[Any], - peaks: list[list[Any]], - start: int, - end: int, - step: int, + states_ua: Any, + states_res: Any, + flexible_ua: Any, + flexible_res: Any, ) -> list[str]: """Assign discrete state labels for the provided dihedrals. @@ -471,62 +417,118 @@ def _assign_states( molecules: Molecule ids in the group. dihedrals: Dihedral AtomGroups. peaks: Peaks per dihedral. - start: Unused in legacy sampling. - end: Unused in legacy sampling. - step: Unused in legacy sampling. Returns: List of state labels (strings). """ - states: list[str] = [] - num_flexible = 0 + rep_mol = self._universe_operations.extract_fragment(data_container, 0) + number_frames = len(rep_mol.trajectory) + num_residues = len(rep_mol.residues) + state_res = [] + flex_res = 0 for molecule in molecules: - conformations: list[list[Any]] = [] mol = self._universe_operations.extract_fragment(data_container, molecule) - number_frames = len(mol.trajectory) - - dihedral_results = Dihedral(dihedrals).run() - - for dihedral_index in range(len(dihedrals)): - conformation: list[Any] = [] - - # Check for flexible dihedrals - if len(peaks[dihedral_index]) > 1 and molecule == 0: - num_flexible += 1 - - # Get conformations - for timestep in range(number_frames): - value = dihedral_results.results.angles[timestep][dihedral_index] - # We want postive values in range 0 to 360 to make - # the peak assignment. - # works using the fact that dihedrals have circular symmetry - # (i.e. -15 degrees = +345 degrees) - if value < 0: - value += 360 - - # Find the peak closest to the dihedral value - distances = [abs(value - peak) for peak in peaks[dihedral_index]] - conformation.append(np.argmin(distances)) - - conformations.append(conformation) - - # Concatenate all the dihedrals in the molecule into the state - # for the frame. - mol_states = [ - state - for state in ( - "".join( - str(int(conformations[d][f])) for d in range(len(dihedrals)) - ) - for f in range(number_frames) - ) - if state - ] - states.extend(mol_states) + for level in level_list: + if level == "united_atom": + for res_id in range(num_residues): + key = (group_id, res_id) + heavy_res = self._select_heavy_residue(mol, res_id) + dihedrals = self._get_dihedrals(heavy_res, level) + num_dihedrals = len(dihedrals) + if num_dihedrals == 0: + # No dihedrals, no conformations + states_ua[key] = [] + flexible_ua[key] = 0 + else: + dihedral_results = Dihedral(dihedrals).run() + states, flexible = self._process_conformations( + peaks_ua[res_id], + dihedral_results, + num_dihedrals, + number_frames, + ) + if key not in states_ua: + states_ua[key] = states + flexible_ua[key] = flexible + else: + states_ua[key].extend(states) + flexible_ua[key] = max(flexible_ua[key], flexible) + + if level == "residue": + dihedrals = self._get_dihedrals(mol, level) + num_dihedrals = len(dihedrals) + if num_dihedrals == 0: + # No dihedrals, no conformations + state_res = [] + else: + dihedral_results = Dihedral(dihedrals).run() + states, flexible = self._process_conformations( + peaks_res, + dihedral_results, + num_dihedrals, + number_frames, + ) + state_res.extend(states) + flex_res = max(flex_res, flexible) + + states_res.append(state_res) + flexible_res.append(flex_res) + + def _process_conformations( + self, peaks, dihedral_results, num_dihedrals, number_frames + ): + """ + Find conformations + + Args: + peaks: Histogram peaks. + num_dihedrals: Number of dihedral angles in the molecule or residue. + Returns: + conformations + """ + states: list[list[Any]] = [] + conformations: list[list[Any]] = [] + num_flexible = 0 + for dihedral_index in range(num_dihedrals): + conformation: list[Any] = [] + + # Check for flexible dihedrals + # if len(peaks[dihedral_index]) > 1: + # num_flexible += 1 + + # Get conformations + for timestep in range(number_frames): + value = dihedral_results.results.angles[timestep][dihedral_index] + # We want postive values in range 0 to 360 to make + # the peak assignment. + # works using the fact that dihedrals have circular symmetry + # (i.e. -15 degrees = +345 degrees) + if value < 0: + value += 360 + + # Find the peak closest to the dihedral value + distances = [abs(value - peak) for peak in peaks[dihedral_index]] + conformation.append(np.argmin(distances)) + + unique = np.unique(conformation) + if len(unique) > 1: + num_flexible += 1 + + conformations.append(conformation) + + # Concatenate all the dihedrals in the molecule into the state + # for the frame. + mol_states = [ + state + for state in ( + "".join(str(int(conformations[d][f])) for d in range(num_dihedrals)) + for f in range(number_frames) + ) + if state + ] - logger.debug(f"States: {states}") - logger.debug(f"Number of flexible dihedrals: {num_flexible}") + states.extend(mol_states) return states, num_flexible diff --git a/CodeEntropy/levels/level_dag.py b/CodeEntropy/levels/level_dag.py index f43f1ef..72e0719 100644 --- a/CodeEntropy/levels/level_dag.py +++ b/CodeEntropy/levels/level_dag.py @@ -179,28 +179,14 @@ def _run_frame_stage( Notes: The task title shows the current frame index being processed. """ - u = shared_data["reduced_universe"] - start, end, step = shared_data["start"], shared_data["end"], shared_data["step"] + n_frames = shared_data["n_frames"] task: TaskID | None = None total_frames: int | None = None if progress is not None: try: - n_frames = len(u.trajectory) - - s = 0 if start is None else int(start) - e = n_frames if end is None else int(end) - - if e < 0: - e = n_frames + e - - e = max(0, min(e, n_frames)) - s = max(0, min(s, e)) - - st = 1 if step is None else int(step) - if st > 0: - total_frames = max(0, (e - s + st - 1) // st) + total_frames = n_frames except Exception: total_frames = None @@ -210,11 +196,11 @@ def _run_frame_stage( title="Initializing", ) - for ts in u.trajectory[start:end:step]: + for frame_index in range(n_frames): if progress is not None and task is not None: - progress.update(task, title=f"Frame {ts.frame}") + progress.update(task, title=f"Frame {frame_index}") - frame_out = self._frame_dag.execute_frame(shared_data, ts.frame) + frame_out = self._frame_dag.execute_frame(shared_data, frame_index) self._reduce_one_frame(shared_data, frame_out) if progress is not None and task is not None: diff --git a/CodeEntropy/levels/neighbors.py b/CodeEntropy/levels/neighbors.py index a91b395..7f77fc9 100644 --- a/CodeEntropy/levels/neighbors.py +++ b/CodeEntropy/levels/neighbors.py @@ -32,7 +32,7 @@ def __init__(self): self._levels = None self._search = Search() - def get_neighbors(self, universe, levels, groups, search_type): + def get_neighbors(self, universe, levels, groups, n_frames, search_type): """ Find the neighbors relative to the central molecule. @@ -54,22 +54,16 @@ def get_neighbors(self, universe, levels, groups, search_type): number_neighbors = {} average_number_neighbors = {} - number_frames = len(universe.trajectory) - for group_id in groups.keys(): molecules = groups[group_id] highest_level = levels[molecules[0]][-1] for mol_id in molecules: - for timestep in range(number_frames): - # This is to get MDAnalysis to get the information from the - # correct frame of the trajectory - universe.trajectory[timestep] - + for timestep in range(n_frames): if search_type == "RAD": # Use the relative angular distance method to find neighbors neighbors = self._search.get_RAD_neighbors( - universe=universe, mol_id=mol_id + universe=universe, mol_id=mol_id, timestep=timestep ) elif search_type == "grid": @@ -78,6 +72,7 @@ def get_neighbors(self, universe, levels, groups, search_type): universe=universe, mol_id=mol_id, highest_level=highest_level, + timestep=timestep, ) else: # Raise error for unavailale search_type @@ -91,9 +86,7 @@ def get_neighbors(self, universe, levels, groups, search_type): # Get the average number of neighbors: # dividing the sum by the number of molecules and number of frames number = np.sum(number_neighbors[group_id]) - average_number_neighbors[group_id] = number / ( - len(molecules) * number_frames - ) + average_number_neighbors[group_id] = number / (len(molecules) * n_frames) logger.debug( f"group: {group_id}" f"number neighbors {average_number_neighbors[group_id]}" diff --git a/CodeEntropy/levels/nodes/conformations.py b/CodeEntropy/levels/nodes/conformations.py index 89eb63a..5e84be2 100644 --- a/CodeEntropy/levels/nodes/conformations.py +++ b/CodeEntropy/levels/nodes/conformations.py @@ -23,15 +23,11 @@ class ConformationalStateConfig: """Configuration for conformational state construction. Attributes: - start: Start frame index (inclusive). - end: End frame index (exclusive). - step: Frame stride. + n_frames: Number of frames to be analyised. bin_width: Histogram bin width in degrees. """ - start: int - end: int - step: int + n_frames: int bin_width: int @@ -70,7 +66,7 @@ def run( - "reduced_universe" - "levels" - "groups" - - "start", "end", "step" + - "n_frames" - "args" with attribute "bin_width" progress: Optional progress sink provided by ResultsReporter.progress(). @@ -80,18 +76,14 @@ def run( u = shared_data["reduced_universe"] levels = shared_data["levels"] groups = shared_data["groups"] - - cfg = self._build_config(shared_data) + bin_width = int(shared_data["args"].bin_width) states_ua, states_res, flexible_ua, flexible_res = ( self._dihedral_analysis.build_conformational_states( data_container=u, levels=levels, groups=groups, - start=cfg.start, - end=cfg.end, - step=cfg.step, - bin_width=cfg.bin_width, + bin_width=bin_width, progress=progress, ) ) @@ -111,21 +103,3 @@ def run( shared_data["flexible_dihedrals"] = flexible_states return {"conformational_states": conformational_states} - - @staticmethod - def _build_config(shared_data: SharedData) -> ConformationalStateConfig: - """Extract and validate configuration from shared_data. - - Args: - shared_data: Shared data dictionary. - - Returns: - ConformationalStateConfig with normalized integer fields. - """ - start = int(shared_data["start"]) - end = int(shared_data["end"]) - step = int(shared_data["step"]) - bin_width = int(shared_data["args"].bin_width) - return ConformationalStateConfig( - start=start, end=end, step=step, bin_width=bin_width - ) diff --git a/CodeEntropy/levels/nodes/find_neighbors.py b/CodeEntropy/levels/nodes/find_neighbors.py index 3c9bd80..36cb0b2 100644 --- a/CodeEntropy/levels/nodes/find_neighbors.py +++ b/CodeEntropy/levels/nodes/find_neighbors.py @@ -59,7 +59,7 @@ def run( - "reduced_universe" - "levels" - "groups" - - "start", "end", "step" + - "n_frames" - "args" with attribute "bin_width" progress: Optional progress sink provided by ResultsReporter.progress(). @@ -69,6 +69,7 @@ def run( u = shared_data["reduced_universe"] levels = shared_data["levels"] groups = shared_data["groups"] + n_frames = int(shared_data["n_frames"]) search_type = shared_data["args"].search_type # Get average number of neighbors @@ -76,6 +77,7 @@ def run( universe=u, levels=levels, groups=groups, + n_frames=n_frames, search_type=search_type, ) diff --git a/CodeEntropy/levels/search.py b/CodeEntropy/levels/search.py index 4b6e6ec..f086213 100644 --- a/CodeEntropy/levels/search.py +++ b/CodeEntropy/levels/search.py @@ -192,7 +192,7 @@ def _get_distances(self, coms, i_coords, dimensions): return np.sqrt((delta * delta).sum(axis=1)) - def get_RAD_neighbors(self, universe, mol_id): + def get_RAD_neighbors(self, universe, mol_id, timestep): """ Find RAD neighbors of a given molecule. @@ -206,6 +206,7 @@ def get_RAD_neighbors(self, universe, mol_id): np.ndarray: Indices of neighboring molecules identified via the RAD method. """ + universe.trajectory[timestep] self._update_cache(universe) fragments = self._cached_fragments @@ -239,7 +240,7 @@ def get_RAD_neighbors(self, universe, mol_id): return neighbor_indices - def get_grid_neighbors(self, universe, mol_id, highest_level): + def get_grid_neighbors(self, universe, mol_id, highest_level, timestep): """ Find neighbors using MDAnalysis grid-based neighbor search. @@ -258,6 +259,7 @@ def get_grid_neighbors(self, universe, mol_id, highest_level): np.ndarray: Fragment indices of neighboring molecules. """ + universe.trajectory[timestep] fragments = universe.atoms.fragments fragment = fragments[mol_id] diff --git a/tests/regression/baselines/benzaldehyde/axes_off.json b/tests/regression/baselines/benzaldehyde/axes_off.json index 4437a2f..19438eb 100644 --- a/tests/regression/baselines/benzaldehyde/axes_off.json +++ b/tests/regression/baselines/benzaldehyde/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw0/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 61.61036267672132, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 7.791711490122748 + "residue:Orientational": 20.481571492615355 }, - "total": 190.41925181422317 + "total": 203.1091118167158 } } } diff --git a/tests/regression/baselines/benzaldehyde/combined_forcetorque_false.json b/tests/regression/baselines/benzaldehyde/combined_forcetorque_false.json index 33fecaf..3b7be29 100644 --- a/tests/regression/baselines/benzaldehyde/combined_forcetorque_false.json +++ b/tests/regression/baselines/benzaldehyde/combined_forcetorque_false.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw0/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:Rovibrational": 68.46147102540942, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 7.791711490122748 + "residue:Orientational": 20.481571492615355 }, - "total": 195.49800254632487 + "total": 208.1878625488175 } } } diff --git a/tests/regression/baselines/benzaldehyde/default.json b/tests/regression/baselines/benzaldehyde/default.json index b1d70cf..1c89052 100644 --- a/tests/regression/baselines/benzaldehyde/default.json +++ b/tests/regression/baselines/benzaldehyde/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw1/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 27.950376507672583, "residue:FTmat-Transvibrational": 71.03412922724692, "residue:FTmat-Rovibrational": 59.44169664956799, - "united_atom:Conformational": 0.0, + "united_atom:Conformational": 7.522643899702263, "residue:Conformational": 0.0, - "residue:Orientational": 59.5156759876787 + "residue:Orientational": 59.43920971558428 }, - "total": 242.82706070457093 + "total": 250.27323833217878 } } } diff --git a/tests/regression/baselines/benzaldehyde/frame_window.json b/tests/regression/baselines/benzaldehyde/frame_window.json index a9f6aa5..1453f91 100644 --- a/tests/regression/baselines/benzaldehyde/frame_window.json +++ b/tests/regression/baselines/benzaldehyde/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw1/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 40.30267601961045, - "united_atom:Rovibrational": 38.21906858443615, - "residue:FTmat-Transvibrational": 73.41098578352612, - "residue:FTmat-Rovibrational": 57.881504393660364, + "united_atom:Transvibrational": 0.06976323861519099, + "united_atom:Rovibrational": 43.1148685234083, + "residue:FTmat-Transvibrational": 81.88770108142911, + "residue:FTmat-Rovibrational": 54.95209390854072, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 7.791711490122748 + "residue:Orientational": 20.481571492615355 }, - "total": 217.60594627135583 + "total": 200.50599824460866 } } } diff --git a/tests/regression/baselines/benzaldehyde/grouping_each.json b/tests/regression/baselines/benzaldehyde/grouping_each.json index 58b08b2..77d8cc6 100644 --- a/tests/regression/baselines/benzaldehyde/grouping_each.json +++ b/tests/regression/baselines/benzaldehyde/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw2/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 9.587915463990273 + "residue:Orientational": 31.909265242174982 }, - "total": 26.488985268171085 + "total": 48.81033504635579 }, "1": { "components": { @@ -61,9 +61,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 13.250255095331166 + "residue:Orientational": 31.909265242174982 }, - "total": 30.70184213788489 + "total": 49.36085228472871 }, "3": { "components": { @@ -97,9 +97,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 23.16437388578126 + "residue:Orientational": 31.909265242174982 }, - "total": 34.22999650128771 + "total": 42.97488785768143 }, "6": { "components": { @@ -109,9 +109,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 18.044518549147842 + "residue:Orientational": 0.0 }, - "total": 37.76863350196386 + "total": 19.72411495281602 }, "7": { "components": { @@ -133,9 +133,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 10.453350878685521 + "residue:Orientational": 31.909265242174982 }, - "total": 26.605755727773698 + "total": 48.06167009126315 }, "9": { "components": { diff --git a/tests/regression/baselines/benzaldehyde/rad.json b/tests/regression/baselines/benzaldehyde/rad.json index 8b8dea1..eedb2d8 100644 --- a/tests/regression/baselines/benzaldehyde/rad.json +++ b/tests/regression/baselines/benzaldehyde/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw2/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 27.950376507672583, "residue:FTmat-Transvibrational": 71.03412922724692, "residue:FTmat-Rovibrational": 59.44169664956799, - "united_atom:Conformational": 0.0, + "united_atom:Conformational": 7.522643899702263, "residue:Conformational": 0.0, - "residue:Orientational": 25.3107189764825 + "residue:Orientational": 25.502722133228936 }, - "total": 208.62210369337473 + "total": 216.33675074982344 } } } diff --git a/tests/regression/baselines/benzaldehyde/selection_subset.json b/tests/regression/baselines/benzaldehyde/selection_subset.json index ee4b3fa..d92576a 100644 --- a/tests/regression/baselines/benzaldehyde/selection_subset.json +++ b/tests/regression/baselines/benzaldehyde/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzaldehyde/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzaldehyde/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-53/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw3/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 61.67126452972779, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 7.791711490122748 + "residue:Orientational": 20.481571492615355 }, - "total": 206.65613994967572 + "total": 219.34599995216834 } } } diff --git a/tests/regression/baselines/benzene/axes_off.json b/tests/regression/baselines/benzene/axes_off.json index a70a4cc..3230a15 100644 --- a/tests/regression/baselines/benzene/axes_off.json +++ b/tests/regression/baselines/benzene/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw3/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 47.171663134129304, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 1.1255349480631325 + "residue:Orientational": 0.0 }, - "total": 162.42256458945369 + "total": 161.29702964139057 } } } diff --git a/tests/regression/baselines/benzene/combined_forcetorque_off.json b/tests/regression/baselines/benzene/combined_forcetorque_off.json index 5b264d2..2c3650f 100644 --- a/tests/regression/baselines/benzene/combined_forcetorque_off.json +++ b/tests/regression/baselines/benzene/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw4/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:Rovibrational": 52.85496348419672, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 1.1255349480631325 + "residue:Orientational": 0.0 }, - "total": 152.43617664580827 + "total": 151.31064169774515 } } } diff --git a/tests/regression/baselines/benzene/default.json b/tests/regression/baselines/benzene/default.json index 68b17b2..d8a5c70 100644 --- a/tests/regression/baselines/benzene/default.json +++ b/tests/regression/baselines/benzene/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw4/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 59.93761874375924, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 41.237966715197246 + "residue:Orientational": 41.58427729275938 }, - "total": 210.45393701689989 + "total": 210.800247594462 } } } diff --git a/tests/regression/baselines/benzene/frame_window.json b/tests/regression/baselines/benzene/frame_window.json index 191bd67..57941a1 100644 --- a/tests/regression/baselines/benzene/frame_window.json +++ b/tests/regression/baselines/benzene/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw6/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 11.46552036084548, - "united_atom:Rovibrational": 34.98492056748493, - "residue:FTmat-Transvibrational": 71.83491878606151, - "residue:FTmat-Rovibrational": 55.6098400281744, + "united_atom:Transvibrational": 0.19795850062580336, + "united_atom:Rovibrational": 37.022046871408385, + "residue:FTmat-Transvibrational": 89.61712603903918, + "residue:FTmat-Rovibrational": 59.882255851985164, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 1.1255349480631325 + "residue:Orientational": 0.0 }, - "total": 175.02073469062944 + "total": 186.71938726305854 } } } diff --git a/tests/regression/baselines/benzene/grouping_each.json b/tests/regression/baselines/benzene/grouping_each.json index 3c5a91f..f88998d 100644 --- a/tests/regression/baselines/benzene/grouping_each.json +++ b/tests/regression/baselines/benzene/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-0/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw6/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "40e8a36db44df29720dfc6783865ec87de6ee120" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -49,9 +49,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 9.716642731179457 + "residue:Orientational": 15.089233620075317 }, - "total": 25.00225165968083 + "total": 30.374842548576687 }, "2": { "components": { @@ -61,9 +61,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 0.0 + "residue:Orientational": 15.089233620075317 }, - "total": 20.40290447179586 + "total": 35.492138091871176 }, "3": { "components": { @@ -85,9 +85,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 5.804802962268455 + "residue:Orientational": 0.0 }, - "total": 13.037954242118563 + "total": 7.233151279850108 }, "5": { "components": { @@ -97,9 +97,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 6.519123559451743 + "residue:Orientational": 0.0 }, - "total": 15.060497602422519 + "total": 8.541374042970777 }, "6": { "components": { @@ -109,9 +109,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 1.1102416417044547 + "residue:Orientational": 0.0 }, - "total": 16.582772624429612 + "total": 15.472530982725159 }, "7": { "components": { @@ -133,9 +133,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 4.476183988092513 + "residue:Orientational": 0.0 }, - "total": 27.162341494172075 + "total": 22.686157506079564 }, "9": { "components": { diff --git a/tests/regression/baselines/benzene/rad.json b/tests/regression/baselines/benzene/rad.json index 521ebc1..cabb162 100644 --- a/tests/regression/baselines/benzene/rad.json +++ b/tests/regression/baselines/benzene/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw5/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 59.93761874375924, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 12.282076945243183 + "residue:Orientational": 12.386543820026672 }, - "total": 181.49804724694582 + "total": 181.6025141217293 } } } diff --git a/tests/regression/baselines/benzene/selection_subset.json b/tests/regression/baselines/benzene/selection_subset.json index 81cce2f..3d08939 100644 --- a/tests/regression/baselines/benzene/selection_subset.json +++ b/tests/regression/baselines/benzene/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/benzene/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/benzene/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/benzene/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/benzene/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-50/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw5/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 47.26253953880574, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 1.1255349480631325 + "residue:Orientational": 0.0 }, - "total": 160.40471136929105 + "total": 159.27917642122793 } } } diff --git a/tests/regression/baselines/cyclohexane/axes_off.json b/tests/regression/baselines/cyclohexane/axes_off.json index ffa61e5..688b248 100644 --- a/tests/regression/baselines/cyclohexane/axes_off.json +++ b/tests/regression/baselines/cyclohexane/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw7/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/cyclohexane/combined_forcetorque_off.json b/tests/regression/baselines/cyclohexane/combined_forcetorque_off.json index 4170621..27aa726 100644 --- a/tests/regression/baselines/cyclohexane/combined_forcetorque_off.json +++ b/tests/regression/baselines/cyclohexane/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw7/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/cyclohexane/default.json b/tests/regression/baselines/cyclohexane/default.json index 6580e9b..7cc7650 100644 --- a/tests/regression/baselines/cyclohexane/default.json +++ b/tests/regression/baselines/cyclohexane/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw8/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 47.71088602161552, "residue:FTmat-Transvibrational": 70.3922327806972, "residue:FTmat-Rovibrational": 63.44920824648768, - "united_atom:Conformational": 0.0, + "united_atom:Conformational": 1.288879206695518, "residue:Conformational": 0.0, - "residue:Orientational": 47.30759597445523 + "residue:Orientational": 47.54362774624537 }, - "total": 240.58639488195587 + "total": 242.11130586044152 } } } diff --git a/tests/regression/baselines/cyclohexane/frame_window.json b/tests/regression/baselines/cyclohexane/frame_window.json index 819082e..0363989 100644 --- a/tests/regression/baselines/cyclohexane/frame_window.json +++ b/tests/regression/baselines/cyclohexane/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw8/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 17.398382397359153, - "united_atom:Rovibrational": 73.96792995794405, - "residue:FTmat-Transvibrational": 76.4267996157354, - "residue:FTmat-Rovibrational": 63.30469126284744, + "united_atom:Transvibrational": 0.9922566704968832, + "united_atom:Rovibrational": 25.157330630108138, + "residue:FTmat-Transvibrational": 88.28792477558463, + "residue:FTmat-Rovibrational": 65.39813357771244, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 231.09780323388605 + "total": 179.83564565390208 } } } diff --git a/tests/regression/baselines/cyclohexane/grouping_each.json b/tests/regression/baselines/cyclohexane/grouping_each.json index 46acbee..53bc9b5 100644 --- a/tests/regression/baselines/cyclohexane/grouping_each.json +++ b/tests/regression/baselines/cyclohexane/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw10/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/cyclohexane/rad.json b/tests/regression/baselines/cyclohexane/rad.json index 4ee61d7..64340bc 100644 --- a/tests/regression/baselines/cyclohexane/rad.json +++ b/tests/regression/baselines/cyclohexane/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw10/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 47.71088602161552, "residue:FTmat-Transvibrational": 70.3922327806972, "residue:FTmat-Rovibrational": 63.44920824648768, - "united_atom:Conformational": 0.0, + "united_atom:Conformational": 1.288879206695518, "residue:Conformational": 0.0, - "residue:Orientational": 13.963860657362106 + "residue:Orientational": 14.049324060636614 }, - "total": 207.24265956486275 + "total": 208.61700217483278 } } } diff --git a/tests/regression/baselines/cyclohexane/selection_subset.json b/tests/regression/baselines/cyclohexane/selection_subset.json index 86332b2..491c4d8 100644 --- a/tests/regression/baselines/cyclohexane/selection_subset.json +++ b/tests/regression/baselines/cyclohexane/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/cyclohexane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/cyclohexane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-45/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw9/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/dna/axes_off.json b/tests/regression/baselines/dna/axes_off.json index e130d0e..da7dccf 100644 --- a/tests/regression/baselines/dna/axes_off.json +++ b/tests/regression/baselines/dna/axes_off.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw9/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,39 +23,39 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { "united_atom:Transvibrational": 0.0, - "united_atom:Rovibrational": 1.2269044878385265, + "united_atom:Rovibrational": 138.6554635683915, "residue:Transvibrational": 0.0, - "residue:Rovibrational": 27.45710747332319, - "polymer:FTmat-Transvibrational": 48.62026970762269, + "residue:Rovibrational": 3.7744745512812843, + "polymer:FTmat-Transvibrational": 13.548865634429543, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 10.584542990557836, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 89.10433045823575 + "total": 171.3222520812879 }, "1": { "components": { "united_atom:Transvibrational": 0.0, - "united_atom:Rovibrational": 1.7972774672527945, + "united_atom:Rovibrational": 0.018570889591209457, "residue:Transvibrational": 0.0, - "residue:Rovibrational": 25.287669468441067, - "polymer:FTmat-Transvibrational": 60.47397935339153, + "residue:Rovibrational": 6.178603242071742, + "polymer:FTmat-Transvibrational": 14.075720078226187, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 5.292271495278918, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 99.1901232253754 + "total": 30.32407104179577 } } } diff --git a/tests/regression/baselines/dna/combined_forcetorque_off.json b/tests/regression/baselines/dna/combined_forcetorque_off.json index aa5253d..f855675 100644 --- a/tests/regression/baselines/dna/combined_forcetorque_off.json +++ b/tests/regression/baselines/dna/combined_forcetorque_off.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw11/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,11 +37,11 @@ "residue:Rovibrational": 3.376800684085249, "polymer:Transvibrational": 21.18266215491188, "polymer:Rovibrational": 12.837576042626923, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 49.19924835008753 + "total": 42.1581048972639 }, "1": { "components": { @@ -51,11 +51,11 @@ "residue:Rovibrational": 2.3863201082544565, "polymer:Transvibrational": 16.607667396609116, "polymer:Rovibrational": 12.304363914795593, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 0.0, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 42.94801263360868 + "total": 36.07572103394637 } } } diff --git a/tests/regression/baselines/dna/default.json b/tests/regression/baselines/dna/default.json index 4f1cf69..7716349 100644 --- a/tests/regression/baselines/dna/default.json +++ b/tests/regression/baselines/dna/default.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw11/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,11 +37,11 @@ "residue:Rovibrational": 3.376800684085249, "polymer:FTmat-Transvibrational": 12.341104347192612, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 27.52011449974134 + "total": 20.478971046917703 }, "1": { "components": { @@ -51,11 +51,11 @@ "residue:Rovibrational": 2.3863201082544565, "polymer:FTmat-Transvibrational": 11.11037253388596, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 0.0, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 25.14635385608993 + "total": 18.274062256427623 } } } diff --git a/tests/regression/baselines/dna/frame_window.json b/tests/regression/baselines/dna/frame_window.json index d9782bc..2a76ec5 100644 --- a/tests/regression/baselines/dna/frame_window.json +++ b/tests/regression/baselines/dna/frame_window.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,39 +23,39 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { "united_atom:Transvibrational": 0.0, - "united_atom:Rovibrational": 1.5821720528374943, + "united_atom:Rovibrational": 138.656450674966, "residue:Transvibrational": 0.0, - "residue:Rovibrational": 27.397449238560412, - "polymer:FTmat-Transvibrational": 48.62026970762269, + "residue:Rovibrational": 3.7688488322030405, + "polymer:FTmat-Transvibrational": 13.548865634429543, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 10.584542990557836, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 89.39993978847194 + "total": 171.31761346878415 }, "1": { "components": { "united_atom:Transvibrational": 0.0, - "united_atom:Rovibrational": 2.5277936366208014, + "united_atom:Rovibrational": 0.03040252662727023, "residue:Transvibrational": 0.0, - "residue:Rovibrational": 24.80670067454149, - "polymer:FTmat-Transvibrational": 60.47397935339153, + "residue:Rovibrational": 6.102344853380676, + "polymer:FTmat-Transvibrational": 14.075720078226187, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 5.292271495278918, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 99.43967060084383 + "total": 30.259644290140763 } } } diff --git a/tests/regression/baselines/dna/grouping_each.json b/tests/regression/baselines/dna/grouping_each.json index 15551c8..7e2fd86 100644 --- a/tests/regression/baselines/dna/grouping_each.json +++ b/tests/regression/baselines/dna/grouping_each.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,11 +37,11 @@ "residue:Rovibrational": 3.376800684085249, "polymer:FTmat-Transvibrational": 12.341104347192612, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 27.52011449974134 + "total": 20.478971046917703 }, "1": { "components": { @@ -51,11 +51,11 @@ "residue:Rovibrational": 2.3863201082544565, "polymer:FTmat-Transvibrational": 11.11037253388596, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 0.0, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 25.14635385608993 + "total": 18.274062256427623 } } } diff --git a/tests/regression/baselines/dna/selection_subset.json b/tests/regression/baselines/dna/selection_subset.json index a29436b..32816e0 100644 --- a/tests/regression/baselines/dna/selection_subset.json +++ b/tests/regression/baselines/dna/selection_subset.json @@ -1,8 +1,8 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna.tpr", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna.tpr", + "/home/ogo12949/CodeEntropy/.testdata/dna/md_A4_dna_xf.trr" ], "force_file": null, "file_format": null, @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-44/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw13/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,11 +37,11 @@ "residue:Rovibrational": 3.376800684085249, "polymer:FTmat-Transvibrational": 12.341104347192612, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.0411434528236345, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 27.52011449974134 + "total": 20.478971046917703 }, "1": { "components": { @@ -51,11 +51,11 @@ "residue:Rovibrational": 2.3863201082544565, "polymer:FTmat-Transvibrational": 11.11037253388596, "polymer:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.410455987098191, - "residue:Conformational": 0.46183561256411515, + "united_atom:Conformational": 0.0, + "residue:Conformational": 0.0, "polymer:Orientational": 4.758905336627712 }, - "total": 25.14635385608993 + "total": 18.274062256427623 } } } diff --git a/tests/regression/baselines/ethyl-acetate/axes_off.json b/tests/regression/baselines/ethyl-acetate/axes_off.json index ada5c38..0d455db 100644 --- a/tests/regression/baselines/ethyl-acetate/axes_off.json +++ b/tests/regression/baselines/ethyl-acetate/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-1/popen-gw0/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw13/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-20-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "35b54c7d4ea40dac345db7fe8f6a0285bf6852e8" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 1.2655393305199973, + "united_atom:Transvibrational": 0.8081103094129065, "united_atom:Rovibrational": 68.85184585731292, "residue:FTmat-Transvibrational": 77.33844477785695, "residue:FTmat-Rovibrational": 56.03921993686319, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 7.90098624365273, "residue:Conformational": 0.0, - "residue:Orientational": 3.2718547817092687 + "residue:Orientational": 0.0 }, - "total": 214.9076830024609 + "total": 210.9386071250987 } } } diff --git a/tests/regression/baselines/ethyl-acetate/combined_forcetorque_off.json b/tests/regression/baselines/ethyl-acetate/combined_forcetorque_off.json index 3477105..9e69d48 100644 --- a/tests/regression/baselines/ethyl-acetate/combined_forcetorque_off.json +++ b/tests/regression/baselines/ethyl-acetate/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw14/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 1.5315510444158251, + "united_atom:Transvibrational": 1.196367074472673, "united_atom:Rovibrational": 82.36455154278131, "residue:Transvibrational": 64.68750154134017, "residue:Rovibrational": 58.903938937880085, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 7.90098624365273, "residue:Conformational": 0.0, - "residue:Orientational": 3.2718547817092687 + "residue:Orientational": 0.0 }, - "total": 218.90017616632525 + "total": 215.05334534012698 } } } diff --git a/tests/regression/baselines/ethyl-acetate/default.json b/tests/regression/baselines/ethyl-acetate/default.json index 99dd1a1..0f20cb2 100644 --- a/tests/regression/baselines/ethyl-acetate/default.json +++ b/tests/regression/baselines/ethyl-acetate/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw14/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 20.24374894231227, + "united_atom:Transvibrational": 19.703248485425714, "united_atom:Rovibrational": 49.35007067210558, "residue:FTmat-Transvibrational": 67.91350627765567, "residue:FTmat-Rovibrational": 60.042233035077246, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 8.175537881068413, "residue:Conformational": 0.0, - "residue:Orientational": 65.3684992300889 + "residue:Orientational": 65.33877737416202 }, - "total": 271.0588364754383 + "total": 270.52337372549465 } } } diff --git a/tests/regression/baselines/ethyl-acetate/frame_window.json b/tests/regression/baselines/ethyl-acetate/frame_window.json index 13f69fd..5243dcf 100644 --- a/tests/regression/baselines/ethyl-acetate/frame_window.json +++ b/tests/regression/baselines/ethyl-acetate/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw15/test_regression_matches_baseli0/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 28.312711247966337, - "united_atom:Rovibrational": 51.99036142818903, - "residue:FTmat-Transvibrational": 67.80560626717748, - "residue:FTmat-Rovibrational": 55.1631201009248, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Transvibrational": 0.7923511180672675, + "united_atom:Rovibrational": 71.06179603616442, + "residue:FTmat-Transvibrational": 83.06772281534602, + "residue:FTmat-Rovibrational": 48.869571179742096, + "united_atom:Conformational": 8.635471458692102, "residue:Conformational": 0.0, - "residue:Orientational": 3.2718547817092687 + "residue:Orientational": 0.0 }, - "total": 214.6844321441655 + "total": 212.4269126080119 } } } diff --git a/tests/regression/baselines/ethyl-acetate/grouping_each.json b/tests/regression/baselines/ethyl-acetate/grouping_each.json index d4f80d6..1c64a90 100644 --- a/tests/regression/baselines/ethyl-acetate/grouping_each.json +++ b/tests/regression/baselines/ethyl-acetate/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw15/test_regression_matches_baseli1/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 0.041680247513564334, "residue:FTmat-Transvibrational": 13.339420001372439, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 21.5218785670846 + "total": 13.381100248886003 }, "1": { "components": { @@ -47,11 +47,11 @@ "united_atom:Rovibrational": 0.1351925826754994, "residue:FTmat-Transvibrational": 17.260433457821385, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 4.869492932129766, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 22.265118972626652 + "total": 17.395626040496886 }, "2": { "components": { @@ -59,11 +59,11 @@ "united_atom:Rovibrational": 0.36182067478253577, "residue:FTmat-Transvibrational": 14.447464165462247, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 6.664553650467566, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 21.473838490712346 + "total": 14.809284840244782 }, "3": { "components": { @@ -71,11 +71,11 @@ "united_atom:Rovibrational": 0.08920089761061596, "residue:FTmat-Transvibrational": 17.349320458476775, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.067541186685671, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 24.506062542773062 + "total": 17.438521356087392 }, "4": { "components": { @@ -83,11 +83,11 @@ "united_atom:Rovibrational": 0.245873201826214, "residue:FTmat-Transvibrational": 14.544753730547711, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.124517826214254, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 4.858281876548707 + "residue:Orientational": 0.0 }, - "total": 26.773426635136886 + "total": 14.790626932373925 }, "5": { "components": { @@ -95,11 +95,11 @@ "united_atom:Rovibrational": 0.026788453489210204, "residue:FTmat-Transvibrational": 9.570910150584444, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.4531276098659065, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 5.199993382713831 + "residue:Orientational": 0.0 }, - "total": 22.250819596653393 + "total": 9.597698604073654 }, "6": { "components": { @@ -107,11 +107,11 @@ "united_atom:Rovibrational": 0.052298040051129174, "residue:FTmat-Transvibrational": 12.801663361822174, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 8.580191120540489, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 21.43415252241379 + "total": 12.853961401873303 }, "7": { "components": { @@ -119,11 +119,11 @@ "united_atom:Rovibrational": 0.29162538377256375, "residue:FTmat-Transvibrational": 16.40926078565228, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 8.807147901866925, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 15.64626157108563 + "residue:Orientational": 0.0 }, - "total": 41.1542956423774 + "total": 16.70088616942484 }, "8": { "components": { @@ -131,11 +131,11 @@ "united_atom:Rovibrational": 0.0469384299833255, "residue:FTmat-Transvibrational": 10.172098915253201, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.3875802362162775, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 15.64626157108563 + "residue:Orientational": 0.0 }, - "total": 33.25287915253843 + "total": 10.219037345236528 }, "9": { "components": { @@ -143,11 +143,11 @@ "united_atom:Rovibrational": 0.2807736872545627, "residue:FTmat-Transvibrational": 12.020836126353892, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 7.711816673378753, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 5.199993382713831 + "residue:Orientational": 0.0 }, - "total": 25.21341986970104 + "total": 12.301609813608454 } } } diff --git a/tests/regression/baselines/ethyl-acetate/rad.json b/tests/regression/baselines/ethyl-acetate/rad.json index f539d83..d63d0dc 100644 --- a/tests/regression/baselines/ethyl-acetate/rad.json +++ b/tests/regression/baselines/ethyl-acetate/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw11/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 20.24374894231227, + "united_atom:Transvibrational": 19.703248485425714, "united_atom:Rovibrational": 49.35007067210558, "residue:FTmat-Transvibrational": 67.91350627765567, "residue:FTmat-Rovibrational": 60.042233035077246, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 8.175537881068413, "residue:Conformational": 0.0, - "residue:Orientational": 30.894081870911737 + "residue:Orientational": 30.739736508673403 }, - "total": 236.5844191162611 + "total": 235.92433286000602 } } } diff --git a/tests/regression/baselines/ethyl-acetate/selection_subset.json b/tests/regression/baselines/ethyl-acetate/selection_subset.json index 2ca0abe..e704b62 100644 --- a/tests/regression/baselines/ethyl-acetate/selection_subset.json +++ b/tests/regression/baselines/ethyl-acetate/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/ethyl-acetate/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/ethyl-acetate/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-47/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw13/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 1.5315510444158251, + "united_atom:Transvibrational": 1.196367074472673, "united_atom:Rovibrational": 82.36455154278131, "residue:FTmat-Transvibrational": 74.5939232239247, "residue:FTmat-Rovibrational": 55.42964192531005, - "united_atom:Conformational": 8.140778318198597, + "united_atom:Conformational": 7.90098624365273, "residue:Conformational": 0.0, - "residue:Orientational": 3.2718547817092687 + "residue:Orientational": 0.0 }, - "total": 225.33230083633973 + "total": 221.48547001014148 } } } diff --git a/tests/regression/baselines/methane/axes_off.json b/tests/regression/baselines/methane/axes_off.json index 15e8583..be31bc2 100644 --- a/tests/regression/baselines/methane/axes_off.json +++ b/tests/regression/baselines/methane/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methane/combined_forcetorque_off.json b/tests/regression/baselines/methane/combined_forcetorque_off.json index 6d52a3d..baf41a2 100644 --- a/tests/regression/baselines/methane/combined_forcetorque_off.json +++ b/tests/regression/baselines/methane/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw11/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methane/default.json b/tests/regression/baselines/methane/default.json index 8265764..f95f6b9 100644 --- a/tests/regression/baselines/methane/default.json +++ b/tests/regression/baselines/methane/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw2/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -34,9 +34,9 @@ "united_atom:Transvibrational": 40.3239711717637, "united_atom:Rovibrational": 33.60582165153992, "united_atom:Conformational": 0.0, - "united_atom:Orientational": 3.6608703176607116 + "united_atom:Orientational": 3.596676624528629 }, - "total": 77.59066314096432 + "total": 77.52646944783224 } } } diff --git a/tests/regression/baselines/methane/frame_window.json b/tests/regression/baselines/methane/frame_window.json index 473cf6b..315c8a6 100644 --- a/tests/regression/baselines/methane/frame_window.json +++ b/tests/regression/baselines/methane/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,20 +23,20 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 40.70376001258969, - "united_atom:Rovibrational": 33.778792396823484, + "united_atom:Transvibrational": 42.1495717236188, + "united_atom:Rovibrational": 39.226038972684975, "united_atom:Conformational": 0.0, "united_atom:Orientational": 0.0 }, - "total": 74.48255240941317 + "total": 81.37561069630377 } } } diff --git a/tests/regression/baselines/methane/grouping_each.json b/tests/regression/baselines/methane/grouping_each.json index 22524ed..143d4d2 100644 --- a/tests/regression/baselines/methane/grouping_each.json +++ b/tests/regression/baselines/methane/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw10/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methane/rad.json b/tests/regression/baselines/methane/rad.json index d8385fb..70d9aef 100644 --- a/tests/regression/baselines/methane/rad.json +++ b/tests/regression/baselines/methane/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw6/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -34,9 +34,9 @@ "united_atom:Transvibrational": 40.3239711717637, "united_atom:Rovibrational": 33.60582165153992, "united_atom:Conformational": 0.0, - "united_atom:Orientational": 6.742734054179628 + "united_atom:Orientational": 6.667209510980459 }, - "total": 80.67252687748325 + "total": 80.59700233428407 } } } diff --git a/tests/regression/baselines/methane/selection_subset.json b/tests/regression/baselines/methane/selection_subset.json index 3cc5fcc..afdd234 100644 --- a/tests/regression/baselines/methane/selection_subset.json +++ b/tests/regression/baselines/methane/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methane/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methane/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methane/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methane/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 112.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-51/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw4/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methanol/axes_off.json b/tests/regression/baselines/methanol/axes_off.json index 3f772aa..a4b5de8 100644 --- a/tests/regression/baselines/methanol/axes_off.json +++ b/tests/regression/baselines/methanol/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw0/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methanol/combined_forcetorque_off.json b/tests/regression/baselines/methanol/combined_forcetorque_off.json index 4e1a044..7a70b9b 100644 --- a/tests/regression/baselines/methanol/combined_forcetorque_off.json +++ b/tests/regression/baselines/methanol/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw15/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/methanol/default.json b/tests/regression/baselines/methanol/default.json index a395827..e85e15a 100644 --- a/tests/regression/baselines/methanol/default.json +++ b/tests/regression/baselines/methanol/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw3/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 32.05829756161347, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 31.476329452223162 + "residue:Orientational": 31.66363493251588 }, - "total": 153.2188991677791 + "total": 153.40620464807185 } } } diff --git a/tests/regression/baselines/methanol/frame_window.json b/tests/regression/baselines/methanol/frame_window.json index cbbecb9..3c85317 100644 --- a/tests/regression/baselines/methanol/frame_window.json +++ b/tests/regression/baselines/methanol/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw14/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { "united_atom:Transvibrational": 0.0, - "united_atom:Rovibrational": 34.6755419354061, - "residue:FTmat-Transvibrational": 61.225853411706915, - "residue:FTmat-Rovibrational": 29.74713345439499, + "united_atom:Rovibrational": 43.01626564417083, + "residue:FTmat-Transvibrational": 74.91032652381023, + "residue:FTmat-Rovibrational": 32.84395719280311, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 125.64852880150801 + "total": 150.77054936078417 } } } diff --git a/tests/regression/baselines/methanol/grouping_each.json b/tests/regression/baselines/methanol/grouping_each.json index 4df0bc9..149c5c8 100644 --- a/tests/regression/baselines/methanol/grouping_each.json +++ b/tests/regression/baselines/methanol/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -97,9 +97,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 0.2618944025459311 + "residue:Orientational": 0.0 }, - "total": 7.393907187868461 + "total": 7.132012785322529 }, "6": { "components": { @@ -133,9 +133,9 @@ "residue:FTmat-Rovibrational": 0.0, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 0.9125191517246148 + "residue:Orientational": 0.0 }, - "total": 9.395203932274601 + "total": 8.482684780549986 }, "9": { "components": { diff --git a/tests/regression/baselines/methanol/rad.json b/tests/regression/baselines/methanol/rad.json index 6928ee3..eb41eb0 100644 --- a/tests/regression/baselines/methanol/rad.json +++ b/tests/regression/baselines/methanol/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw9/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -37,9 +37,9 @@ "residue:FTmat-Rovibrational": 32.05829756161347, "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 17.099561921032407 + "residue:Orientational": 17.021167486252484 }, - "total": 138.84213163658836 + "total": 138.76373720180845 } } } diff --git a/tests/regression/baselines/methanol/selection_subset.json b/tests/regression/baselines/methanol/selection_subset.json index cb017f3..f8ad84f 100644 --- a/tests/regression/baselines/methanol/selection_subset.json +++ b/tests/regression/baselines/methanol/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/methanol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/methanol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/methanol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/methanol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-46/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw7/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/octonol/axes_off.json b/tests/regression/baselines/octonol/axes_off.json index d4c364b..8cc8868 100644 --- a/tests/regression/baselines/octonol/axes_off.json +++ b/tests/regression/baselines/octonol/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw13/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 4.018871224957591, + "united_atom:Transvibrational": 0.2907129992470817, "united_atom:Rovibrational": 16.39249280495534, "residue:FTmat-Transvibrational": 83.57043751308888, "residue:FTmat-Rovibrational": 58.87291960143169, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 16.83949354267619, "residue:Conformational": 0.0, - "residue:Orientational": 19.06182405604338 + "residue:Orientational": 25.79114991860739 }, - "total": 202.33245362639346 + "total": 201.75720638000655 } } } diff --git a/tests/regression/baselines/octonol/combined_forcetorque_off.json b/tests/regression/baselines/octonol/combined_forcetorque_off.json index ca5a2d3..7db4afc 100644 --- a/tests/regression/baselines/octonol/combined_forcetorque_off.json +++ b/tests/regression/baselines/octonol/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw9/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 3.6406563361703705, + "united_atom:Transvibrational": 0.34382967782781193, "united_atom:Rovibrational": 19.154228264604278, "residue:Transvibrational": 74.72816183790984, "residue:Rovibrational": 60.84390144550801, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 16.83949354267619, "residue:Conformational": 0.0, - "residue:Orientational": 19.06182405604338 + "residue:Orientational": 25.79114991860739 }, - "total": 197.84468036615246 + "total": 197.70076468713353 } } } diff --git a/tests/regression/baselines/octonol/default.json b/tests/regression/baselines/octonol/default.json index f203027..63438c4 100644 --- a/tests/regression/baselines/octonol/default.json +++ b/tests/regression/baselines/octonol/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli5/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 50.77228933028987, + "united_atom:Transvibrational": 37.860034170693694, "united_atom:Rovibrational": 84.2608785308744, "residue:FTmat-Transvibrational": 66.13571365167344, "residue:FTmat-Rovibrational": 57.090651827515686, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 34.22940197506605, "residue:Conformational": 0.0, - "residue:Orientational": 74.85579414765692 + "residue:Orientational": 74.78356386019003 }, - "total": 353.5312359139269 + "total": 354.36024401601327 } } } diff --git a/tests/regression/baselines/octonol/frame_window.json b/tests/regression/baselines/octonol/frame_window.json index d50baa9..6339b09 100644 --- a/tests/regression/baselines/octonol/frame_window.json +++ b/tests/regression/baselines/octonol/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw6/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 75.76011510628999, - "united_atom:Rovibrational": 162.26463085986236, - "residue:FTmat-Transvibrational": 74.84326467422125, - "residue:FTmat-Rovibrational": 60.95710412746361, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Transvibrational": 0.5593770868041172, + "united_atom:Rovibrational": 13.488941026792721, + "residue:FTmat-Transvibrational": 79.60741090497159, + "residue:FTmat-Rovibrational": 60.864478264811964, + "united_atom:Conformational": 16.651144380045313, "residue:Conformational": 0.0, - "residue:Orientational": 19.06182405604338 + "residue:Orientational": 25.79114991860739 }, - "total": 413.3028472497972 + "total": 196.9625015820331 } } } diff --git a/tests/regression/baselines/octonol/grouping_each.json b/tests/regression/baselines/octonol/grouping_each.json index c3c3c2c..bf301e9 100644 --- a/tests/regression/baselines/octonol/grouping_each.json +++ b/tests/regression/baselines/octonol/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw15/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -35,11 +35,11 @@ "united_atom:Rovibrational": 6.942013165337579e-05, "residue:FTmat-Transvibrational": 18.33494873681406, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 31.535415760973137 + "residue:Orientational": 0.0 }, - "total": 70.28634234383546 + "total": 18.33501815694571 }, "1": { "components": { @@ -47,11 +47,11 @@ "united_atom:Rovibrational": 0.00013794104464519378, "residue:FTmat-Transvibrational": 14.571797812433102, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 25.283804882769058, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 29.347813215860114 + "residue:Orientational": 45.863560270951176 }, - "total": 69.20355385210692 + "total": 60.43549602442892 }, "2": { "components": { @@ -59,11 +59,11 @@ "united_atom:Rovibrational": 0.0007753303955700146, "residue:FTmat-Transvibrational": 11.64466865126831, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 22.83087746936638, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 34.47632145103026 + "total": 11.64544398166388 }, "3": { "components": { @@ -71,11 +71,11 @@ "united_atom:Rovibrational": 0.0031285818933102145, "residue:FTmat-Transvibrational": 21.24135891910478, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 22.633172290252627, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 43.87765979125072 + "total": 21.24448750099809 }, "4": { "components": { @@ -83,11 +83,11 @@ "united_atom:Rovibrational": 0.0015070029381425056, "residue:FTmat-Transvibrational": 12.221662826352398, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 20.33932047774727, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 32.562490307037805 + "total": 12.22316982929054 }, "5": { "components": { @@ -95,11 +95,11 @@ "united_atom:Rovibrational": 0.005775850934008876, "residue:FTmat-Transvibrational": 7.615636453348747, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 21.436442667442684, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 29.05785497172544 + "total": 7.621412304282756 }, "6": { "components": { @@ -107,11 +107,11 @@ "united_atom:Rovibrational": 0.00028812747686091, "residue:FTmat-Transvibrational": 16.555914111511576, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 24.290085876338953, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 40.84628811532739 + "total": 16.556202238988437 }, "7": { "components": { @@ -119,11 +119,11 @@ "united_atom:Rovibrational": 0.0013568745282136598, "residue:FTmat-Transvibrational": 15.71067757186967, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 16.445839353700418, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 32.1578738000983 + "total": 15.712034446397883 }, "8": { "components": { @@ -131,11 +131,11 @@ "united_atom:Rovibrational": 8.389568220414916e-05, "residue:FTmat-Transvibrational": 13.516454082542095, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 16.20911564736676, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, "residue:Orientational": 0.0 }, - "total": 29.72565362559106 + "total": 13.5165379782243 }, "9": { "components": { @@ -143,11 +143,11 @@ "united_atom:Rovibrational": 0.00015446787843376823, "residue:FTmat-Transvibrational": 20.97761266375896, "residue:FTmat-Rovibrational": 0.0, - "united_atom:Conformational": 23.903613021846652, + "united_atom:Conformational": 0.0, "residue:Conformational": 0.0, - "residue:Orientational": 39.134234408387165 + "residue:Orientational": 45.863560270951176 }, - "total": 84.01561456187122 + "total": 66.84132740258858 } } } diff --git a/tests/regression/baselines/octonol/rad.json b/tests/regression/baselines/octonol/rad.json index 2209df1..90121a6 100644 --- a/tests/regression/baselines/octonol/rad.json +++ b/tests/regression/baselines/octonol/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw0/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 50.77228933028987, + "united_atom:Transvibrational": 37.860034170693694, "united_atom:Rovibrational": 84.2608785308744, "residue:FTmat-Transvibrational": 66.13571365167344, "residue:FTmat-Rovibrational": 57.090651827515686, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 34.22940197506605, "residue:Conformational": 0.0, - "residue:Orientational": 28.13775462144063 + "residue:Orientational": 28.084239413273323 }, - "total": 306.8131963877106 + "total": 307.66091956909656 } } } diff --git a/tests/regression/baselines/octonol/selection_subset.json b/tests/regression/baselines/octonol/selection_subset.json index ffcd7b9..ef07f7b 100644 --- a/tests/regression/baselines/octonol/selection_subset.json +++ b/tests/regression/baselines/octonol/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/octonol/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/octonol/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/octonol/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/octonol/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-48/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw3/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,23 +23,23 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "4d39e9aeeed72fc3993f4a4eb6485da40524ebc5" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 3.6406563361703705, + "united_atom:Transvibrational": 0.34382967782781193, "united_atom:Rovibrational": 19.154228264604278, "residue:FTmat-Transvibrational": 83.17889385114952, "residue:FTmat-Rovibrational": 57.480841206687685, - "united_atom:Conformational": 20.4159084259166, + "united_atom:Conformational": 16.83949354267619, "residue:Conformational": 0.0, - "residue:Orientational": 19.06182405604338 + "residue:Orientational": 25.79114991860739 }, - "total": 202.93235214057185 + "total": 202.78843646155286 } } } diff --git a/tests/regression/baselines/water/axes_off.json b/tests/regression/baselines/water/axes_off.json index a071e45..172edc9 100644 --- a/tests/regression/baselines/water/axes_off.json +++ b/tests/regression/baselines/water/axes_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli0/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw12/test_regression_matches_baseli6/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/water/combined_forcetorque_off.json b/tests/regression/baselines/water/combined_forcetorque_off.json index c52e114..c1e6c67 100644 --- a/tests/regression/baselines/water/combined_forcetorque_off.json +++ b/tests/regression/baselines/water/combined_forcetorque_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli1/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw13/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/water/default.json b/tests/regression/baselines/water/default.json index 9dc3b26..f05b696 100644 --- a/tests/regression/baselines/water/default.json +++ b/tests/regression/baselines/water/default.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli2/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw15/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -34,9 +34,9 @@ "united_atom:Transvibrational": 43.725393337304425, "united_atom:Rovibrational": 17.28911070147887, "united_atom:Conformational": 0.0, - "united_atom:Orientational": 32.00715225476484 + "united_atom:Orientational": 32.193445593362114 }, - "total": 93.02165629354813 + "total": 93.20794963214541 } } } diff --git a/tests/regression/baselines/water/frame_window.json b/tests/regression/baselines/water/frame_window.json index 5061a10..6f4fc5f 100644 --- a/tests/regression/baselines/water/frame_window.json +++ b/tests/regression/baselines/water/frame_window.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli3/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw0/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,20 +23,20 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { "components": { - "united_atom:Transvibrational": 46.684099714230925, - "united_atom:Rovibrational": 17.694014405444744, + "united_atom:Transvibrational": 48.25352455371683, + "united_atom:Rovibrational": 23.131550866115766, "united_atom:Conformational": 0.0, "united_atom:Orientational": 0.0 }, - "total": 64.37811411967567 + "total": 71.38507541983259 } } } diff --git a/tests/regression/baselines/water/grouping_each.json b/tests/regression/baselines/water/grouping_each.json index df4b8a9..7ad5062 100644 --- a/tests/regression/baselines/water/grouping_each.json +++ b/tests/regression/baselines/water/grouping_each.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli4/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw7/test_regression_matches_baseli3/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "each", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/water/rad.json b/tests/regression/baselines/water/rad.json index 89962d0..57abf9f 100644 --- a/tests/regression/baselines/water/rad.json +++ b/tests/regression/baselines/water/rad.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": false, "selection_string": "all", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli5/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw5/test_regression_matches_baseli2/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "RAD" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { @@ -34,9 +34,9 @@ "united_atom:Transvibrational": 79.20298312418278, "united_atom:Rovibrational": 50.90260688502127, "united_atom:Conformational": 0.0, - "united_atom:Orientational": 22.599402683404527 + "united_atom:Orientational": 22.760377489372107 }, - "total": 152.70499269260856 + "total": 152.86596749857614 } } } diff --git a/tests/regression/baselines/water/selection_subset.json b/tests/regression/baselines/water/selection_subset.json index 5d18821..3fc34fe 100644 --- a/tests/regression/baselines/water/selection_subset.json +++ b/tests/regression/baselines/water/selection_subset.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli6/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw9/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": true, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/regression/baselines/water/water_off.json b/tests/regression/baselines/water/water_off.json index 5547232..85614af 100644 --- a/tests/regression/baselines/water/water_off.json +++ b/tests/regression/baselines/water/water_off.json @@ -1,10 +1,10 @@ { "args": { "top_traj_file": [ - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/molecules.top", - "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/trajectory.crd" + "/home/ogo12949/CodeEntropy/.testdata/water/molecules.top", + "/home/ogo12949/CodeEntropy/.testdata/water/trajectory.crd" ], - "force_file": "/home/harry-swift/BioSim/software/CodeEntropy/.testdata/water/forces.frc", + "force_file": "/home/ogo12949/CodeEntropy/.testdata/water/forces.frc", "file_format": "MDCRD", "kcal_force_units": true, "selection_string": "resid 1:10", @@ -14,7 +14,7 @@ "bin_width": 30, "temperature": 298.0, "verbose": false, - "output_file": "/tmp/pytest-of-harry-swift/pytest-49/test_regression_matches_baseli7/job001/output_file.json", + "output_file": "/tmp/pytest-of-ogo12949/pytest-3/popen-gw6/test_regression_matches_baseli4/job001/output_file.json", "force_partitioning": 0.5, "water_entropy": false, "grouping": "molecules", @@ -23,10 +23,10 @@ "search_type": "grid" }, "provenance": { - "python": "3.14.3", - "platform": "Linux-6.17.0-19-generic-x86_64-with-glibc2.39", - "codeentropy_version": "2.1.0", - "git_sha": "be46d826f4ae38e3c6e62a7d5bcddeca85e31590" + "python": "3.13.5", + "platform": "Linux-6.17.0-1017-oem-x86_64-with-glibc2.39", + "codeentropy_version": "2.1.1", + "git_sha": "ac1f2ac999409433f391e45cffd116cdecc46096" }, "groups": { "0": { diff --git a/tests/unit/CodeEntropy/entropy/test_workflow.py b/tests/unit/CodeEntropy/entropy/test_workflow.py index eb87e39..9271ac7 100644 --- a/tests/unit/CodeEntropy/entropy/test_workflow.py +++ b/tests/unit/CodeEntropy/entropy/test_workflow.py @@ -211,8 +211,12 @@ def test_build_reduced_universe_non_all_selects_and_writes_universe(): reduced = MagicMock() reduced.trajectory = list(range(2)) + reduced2 = MagicMock() + reduced2.trajectory = list(range(2)) + uops = MagicMock() uops.select_atoms.return_value = reduced + uops.select_frames.return_value = reduced2 run_manager = MagicMock() reporter = MagicMock() @@ -229,9 +233,9 @@ def test_build_reduced_universe_non_all_selects_and_writes_universe(): out = wf._build_reduced_universe() - assert out is reduced + assert out is reduced2 uops.select_atoms.assert_called_once_with(universe, "protein") - run_manager.write_universe.assert_called_once() + uops.select_frames.assert_called_once_with(reduced, 0, 3, 1) def test_compute_water_entropy_updates_selection_string_and_calls_internal_method(): @@ -303,7 +307,17 @@ def test_build_reduced_universe_all_returns_original_universe(): output_file="out.json", ) universe = MagicMock() + + reduced = MagicMock() + reduced.trajectory = list(range(2)) + + reduced2 = MagicMock() + reduced2.trajectory = list(range(2)) + uops = MagicMock() + uops.select_atoms.return_value = reduced + uops.select_frames.return_value = reduced2 + run_manager = MagicMock() wf = EntropyWorkflow( run_manager, args, universe, MagicMock(), MagicMock(), MagicMock(), uops @@ -311,9 +325,10 @@ def test_build_reduced_universe_all_returns_original_universe(): out = wf._build_reduced_universe() - assert out is universe + assert out is reduced2 uops.select_atoms.assert_not_called() - run_manager.write_universe.assert_not_called() + uops.select_frames.assert_called_once() + run_manager.write_universe.assert_called_once() def test_split_water_groups_partitions_correctly(): diff --git a/tests/unit/CodeEntropy/levels/nodes/test_conformations_node.py b/tests/unit/CodeEntropy/levels/nodes/test_conformations_node.py index 85f145f..7e17f07 100644 --- a/tests/unit/CodeEntropy/levels/nodes/test_conformations_node.py +++ b/tests/unit/CodeEntropy/levels/nodes/test_conformations_node.py @@ -19,6 +19,7 @@ def test_compute_conformational_states_node_runs_and_writes_shared_data(): "start": 0, "end": 10, "step": 1, + "n_frames": 10, "args": SimpleNamespace(bin_width=10), } diff --git a/tests/unit/CodeEntropy/levels/nodes/test_find_neighbors.py b/tests/unit/CodeEntropy/levels/nodes/test_find_neighbors.py index 3cfda97..9318502 100644 --- a/tests/unit/CodeEntropy/levels/nodes/test_find_neighbors.py +++ b/tests/unit/CodeEntropy/levels/nodes/test_find_neighbors.py @@ -18,6 +18,7 @@ def test_compute_find_neighbors_node_runs_and_writes_shared_data(): "start": 0, "end": 10, "step": 1, + "n_frames": 10, "args": SimpleNamespace(search_type="RAD"), } diff --git a/tests/unit/CodeEntropy/levels/test_dihedrals.py b/tests/unit/CodeEntropy/levels/test_dihedrals.py index 6590ecf..1bbdbe9 100644 --- a/tests/unit/CodeEntropy/levels/test_dihedrals.py +++ b/tests/unit/CodeEntropy/levels/test_dihedrals.py @@ -98,52 +98,23 @@ def test_get_dihedrals_residue_builds_one_dihedral_when_4_residues(): assert mol.select_atoms.call_count == 4 -def test_collect_dihedrals_for_group_handles_both_levels(): - dt = ConformationStateBuilder(universe_operations=MagicMock()) +def test_identify_peaks_sets_empty_outputs_when_no_dihedrals(): + uops = MagicMock() + dt = ConformationStateBuilder(universe_operations=uops) mol = MagicMock() - mol.residues = [MagicMock(), MagicMock()] - - with ( - patch.object( - dt, "_select_heavy_residue", side_effect=["heavy0", "heavy1"] - ) as sel_spy, - patch.object( - dt, "_get_dihedrals", side_effect=[["ua0"], ["ua1"], ["res_d0"]] - ) as get_spy, - ): - ua, res = dt._collect_dihedrals_for_group( - mol=mol, level_list=["united_atom", "residue"] - ) - - assert ua == [["ua0"], ["ua1"]] - assert res == ["res_d0"] - assert sel_spy.call_count == 2 - assert get_spy.call_count == 3 - - -def test_collect_peaks_for_group_sets_empty_outputs_when_no_dihedrals(): - dt = ConformationStateBuilder(universe_operations=MagicMock()) - - dihedrals_ua = [[], []] - dihedrals_res = [] + mol.trajectory = [0, 1] + uops.extract_fragment.return_value = mol - with patch.object(dt, "_identify_peaks") as identify_spy: - peaks_ua, peaks_res = dt._collect_peaks_for_group( - data_container=MagicMock(), - molecules=[0], - dihedrals_ua=dihedrals_ua, - dihedrals_res=dihedrals_res, - bin_width=30.0, - start=0, - end=10, - step=1, - level_list=["united_atom", "residue"], - ) + peaks_ua, peaks_res = dt._identify_peaks( + data_container=MagicMock(), + molecules=[0], + bin_width=30.0, + level_list=["united_atom", "residue"], + ) - assert peaks_ua == [[], []] + assert peaks_ua == [] assert peaks_res == [] - identify_spy.assert_not_called() def test_identify_peaks_wraps_negative_angles_and_calls_find_histogram_peaks(): @@ -152,10 +123,17 @@ def test_identify_peaks_wraps_negative_angles_and_calls_find_histogram_peaks(): mol = MagicMock() mol.trajectory = [0, 1] + mol.residues = [MagicMock()] + mol.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) uops.extract_fragment.return_value = mol + dihedral = MagicMock() angles = np.array([[-10.0], [10.0]], dtype=float) + dt._select_heavy_residue = MagicMock(return_value=mol) + dt._get_dihedrals = MagicMock(return_value=dihedral) + dt._process_dihedral_phi = MagicMock(return_value=angles) + class _FakeDihedral: def __init__(self, _dihedrals): pass @@ -165,20 +143,18 @@ def run(self): with ( patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral), - patch.object(dt, "_find_histogram_peaks", return_value=[15.0]) as peaks_spy, + patch.object(dt, "_process_histogram", return_value=[15.0]) as peaks_spy, ): - out = dt._identify_peaks( + out_ua, out_res = dt._identify_peaks( data_container=MagicMock(), molecules=[0], - dihedrals=[MagicMock()], - bin_width=180.0, - start=0, - end=2, - step=1, + bin_width=10.0, + level_list=["united_atom", "residue"], ) - assert out == [[15.0]] - peaks_spy.assert_called_once() + assert out_ua[0] == [15.0] + assert out_res == [15.0] + assert peaks_spy.call_count == 2 def test_find_histogram_peaks_hits_interior_and_wraparound_last_bin(): @@ -196,10 +172,20 @@ def test_assign_states_initialises_then_extends_for_multiple_molecules(): mol = MagicMock() mol.trajectory = [0, 1] + mol.residues = [MagicMock()] + mol.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) uops.extract_fragment.return_value = mol + dihedrals = ["D0"] angles = np.array([[5.0], [15.0]], dtype=float) peaks = [[5.0, 15.0]] + states_ua = {} + states_res = [] + flexible_ua = {} + flexible_res = [] + + dt._select_heavy_residue = MagicMock(return_value=mol) + dt._get_dihedrals = MagicMock(return_value=dihedrals) class _FakeDihedral: def __init__(self, _dihedrals): @@ -209,53 +195,23 @@ def run(self): return SimpleNamespace(results=SimpleNamespace(angles=angles)) with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - states, num_flexible = dt._assign_states( + dt._assign_states( data_container=MagicMock(), + group_id=0, molecules=[0, 1], - dihedrals=["D0"], - peaks=peaks, - start=0, - end=2, - step=1, - ) - - assert states == ["0", "1", "0", "1"] - assert num_flexible == 1 - - -def test_assign_states_for_group_sets_empty_lists_and_delegates_for_nonempty(): - dt = ConformationStateBuilder(universe_operations=MagicMock()) - - states_ua = {} - states_res = [None, None] - flexible_ua = {} - flexible_res = [None, None] - - with patch.object(dt, "_assign_states", return_value=[["x"], 0]) as assign_spy: - dt._assign_states_for_group( - data_container=MagicMock(), - group_id=1, - molecules=[99], - dihedrals_ua=[[], ["UA"]], - peaks_ua=[[], [["p"]]], - dihedrals_res=[], - peaks_res=[], - start=0, - end=2, - step=1, level_list=["united_atom", "residue"], + peaks_ua=[peaks], + peaks_res=peaks, states_ua=states_ua, states_res=states_res, flexible_ua=flexible_ua, flexible_res=flexible_res, ) - assert states_ua[(1, 0)] == [] - assert states_ua[(1, 1)] == ["x"] - assert states_res[1] == [] - assert flexible_ua == {(1, 0): 0, (1, 1): 0} - assert flexible_res == [None, 0] - assert assign_spy.call_count == 1 + assert states_ua[(0, 0)] == ["0", "1", "0", "1"] + assert flexible_ua[(0, 0)] == 1 + assert states_res[0] == ["0", "1", "0", "1"] + assert flexible_res[0] == 1 def test_build_conformational_states_runs_group_and_skips_empty_group(monkeypatch): @@ -267,34 +223,30 @@ def test_build_conformational_states_runs_group_and_skips_empty_group(monkeypatc uops.extract_fragment.return_value = MagicMock(trajectory=[0]) - monkeypatch.setattr(dt, "_collect_dihedrals_for_group", lambda **kw: ([], [])) - monkeypatch.setattr(dt, "_collect_peaks_for_group", lambda **kw: ([], [])) - monkeypatch.setattr(dt, "_assign_states_for_group", lambda **kw: None) - states_ua, states_res, flex_ua, flex_res = dt.build_conformational_states( data_container=MagicMock(), levels=levels, groups=groups, - start=0, - end=1, - step=1, bin_width=30.0, ) assert states_ua == {} - assert len(states_res) == 2 + assert len(states_res) == 3 assert flex_ua == {} - assert flex_res == [0, 0] + assert flex_res[0] == 0 -def test_identify_peaks_handles_multiple_dihedrals_and_calls_histogram_each_time(): +def test_identify_peaks_handles_multiple_dihedrals(): uops = MagicMock() dt = ConformationStateBuilder(universe_operations=uops) mol = MagicMock() mol.trajectory = [0, 1] + mol.residues = [MagicMock()] + mol.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) uops.extract_fragment.return_value = mol + dihedrals = (["D0", "D1"],) angles = np.array( [ [-10.0, 10.0], @@ -303,6 +255,11 @@ def test_identify_peaks_handles_multiple_dihedrals_and_calls_histogram_each_time dtype=float, ) + dt._select_heavy_residue = MagicMock(return_value=mol) + dt._get_dihedrals = MagicMock(return_value=dihedrals) + dt._process_dihedral_phi = MagicMock(return_value=angles) + dt._process_histogram = MagicMock(return_value=[1, 2]) + class _FakeDihedral: def __init__(self, _dihedrals): pass @@ -310,24 +267,16 @@ def __init__(self, _dihedrals): def run(self): return SimpleNamespace(results=SimpleNamespace(angles=angles)) - with ( - patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral), - patch( - "CodeEntropy.levels.dihedrals.np.histogram", wraps=np.histogram - ) as hist_spy, - ): - out = dt._identify_peaks( + with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): + out_ua, out_res = dt._identify_peaks( data_container=MagicMock(), molecules=[0], - dihedrals=["D0", "D1"], - bin_width=180.0, - start=0, - end=2, - step=1, + bin_width=30.0, + level_list=["united_atom", "residue"], ) - assert len(out) == 2 - assert hist_spy.call_count == 2 + assert len(out_ua[0]) == 2 + assert len(out_res) == 2 def test_assign_states_filters_out_empty_state_strings_when_no_dihedrals(): @@ -336,8 +285,19 @@ def test_assign_states_filters_out_empty_state_strings_when_no_dihedrals(): mol = MagicMock() mol.trajectory = [0, 1, 2] + mol.residues = [MagicMock()] + mol.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) uops.extract_fragment.return_value = mol + dihedrals = [] + states_ua = {} + states_res = [] + flexible_ua = {} + flexible_res = [] + + dt._select_heavy_residue = MagicMock(return_value=mol) + dt._get_dihedrals = MagicMock(return_value=dihedrals) + class _FakeDihedral: def __init__(self, _dihedrals): pass @@ -346,18 +306,23 @@ def run(self): return SimpleNamespace(results=SimpleNamespace(angles=[])) with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - out_state, out_flex = dt._assign_states( + dt._assign_states( data_container=MagicMock(), + group_id=0, molecules=[0], - dihedrals=[], - peaks=[], - start=0, - end=3, - step=1, + level_list=["united_atom", "residue"], + peaks_ua=[], + peaks_res=[], + states_ua=states_ua, + states_res=states_res, + flexible_ua=flexible_ua, + flexible_res=flexible_res, ) - assert out_state == [] - assert out_flex == 0 + assert states_ua[(0, 0)] == [] + assert flexible_ua[(0, 0)] == 0 + assert states_res[0] == [] + assert flexible_res[0] == 0 def test_identify_peaks_multiple_molecules_real_histogram(): @@ -366,158 +331,47 @@ def test_identify_peaks_multiple_molecules_real_histogram(): mol0 = MagicMock() mol0.trajectory = [0, 1] + mol0.residues = [MagicMock()] + mol0.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) mol1 = MagicMock() mol1.trajectory = [0, 1] + mol1.residues = [MagicMock()] + mol1.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) - uops.extract_fragment.side_effect = [mol0, mol1] + uops.extract_fragment.side_effect = [mol0, mol0, mol1] + dihedrals = ["D0"] angles = np.array([[10.0], [20.0]], dtype=float) + phi_values = {} + phi_values[0] = np.array([[10.0], [20.0]], dtype=float) - class _FakeDihedral: - def __init__(self, _): - pass - - def run(self): - return SimpleNamespace(results=SimpleNamespace(angles=angles)) - - with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - peaks = dt._identify_peaks( - data_container=MagicMock(), - molecules=[0, 1], - dihedrals=["D0"], - bin_width=90.0, - start=0, - end=2, - step=1, - ) - - assert len(peaks) == 1 - - -def test_identify_peaks_real_histogram_without_spy(): - uops = MagicMock() - dt = ConformationStateBuilder(universe_operations=uops) - - mol = MagicMock() - mol.trajectory = [0, 1] - uops.extract_fragment.return_value = mol - - angles = np.array([[10.0], [20.0]], dtype=float) + dt._select_heavy_residue = MagicMock(return_value=mol0) + dt._get_dihedrals = MagicMock(return_value=dihedrals) + dt._process_dihedral_phi = MagicMock(return_value=phi_values) class _FakeDihedral: - def __init__(self, _): - pass - - def run(self): - return SimpleNamespace(results=SimpleNamespace(angles=angles)) - - with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - peaks = dt._identify_peaks( - data_container=MagicMock(), - molecules=[0], - dihedrals=["D0"], - bin_width=90.0, - start=0, - end=2, - step=1, - ) - - assert isinstance(peaks, list) - - -def test_assign_states_for_group_residue_nonempty_calls_assign_states(): - dt = ConformationStateBuilder(universe_operations=MagicMock()) - - states_ua = {} - states_res = [None, None] - flexible_ua = {} - flexible_res = [None, None] - - with patch.object(dt, "_assign_states", return_value=[["A"], 0]) as spy: - dt._assign_states_for_group( - data_container=MagicMock(), - group_id=1, - molecules=[0], - dihedrals_ua=[[]], - peaks_ua=[[]], - dihedrals_res=["D"], - peaks_res=[["p"]], - start=0, - end=1, - step=1, - level_list=["residue"], - states_ua=states_ua, - states_res=states_res, - flexible_ua=flexible_ua, - flexible_res=flexible_res, - ) - - assert states_res[1] == ["A"] - assert flexible_res[1] == 0 - spy.assert_called_once() - - -def test_assign_states_first_empty_then_extend(): - uops = MagicMock() - dt = ConformationStateBuilder(universe_operations=uops) - - mol0 = MagicMock() - mol0.trajectory = [] - mol1 = MagicMock() - mol1.trajectory = [0] - - uops.extract_fragment.side_effect = [mol0, mol1] - - angles = np.array([[10.0]], dtype=float) - - class _FakeDihedral: - def __init__(self, _): + def __init__(self, _dihedrals): pass def run(self): return SimpleNamespace(results=SimpleNamespace(angles=angles)) - with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - states, num_flex = dt._assign_states( + with ( + patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral), + patch( + "CodeEntropy.levels.dihedrals.ConformationStateBuilder._process_dihedral_phi", + dt._process_dihedral_phi, + ), + ): + peaks_ua, peaks_res = dt._identify_peaks( data_container=MagicMock(), molecules=[0, 1], - dihedrals=["D0"], - peaks=[[10.0]], - start=0, - end=1, - step=1, - ) - - assert states == ["0"] - assert num_flex == 0 - - -def test_collect_peaks_for_group_calls_identify_peaks_for_ua_and_residue(): - dt = ConformationStateBuilder(universe_operations=MagicMock()) - - dihedrals_ua = [["UA_D0"]] - dihedrals_res = ["RES_D0"] - - with patch.object( - dt, - "_identify_peaks", - side_effect=[[["ua_peak"]], [["res_peak"]]], - ) as identify_spy: - peaks_ua, peaks_res = dt._collect_peaks_for_group( - data_container=MagicMock(), - molecules=[0], - dihedrals_ua=dihedrals_ua, - dihedrals_res=dihedrals_res, - bin_width=30.0, - start=0, - end=10, - step=1, + bin_width=90.0, level_list=["united_atom", "residue"], ) - assert peaks_ua == [[["ua_peak"]]] - assert peaks_res == [["res_peak"]] - assert identify_spy.call_count == 2 + assert len(peaks_ua) == 1 + assert len(peaks_res) == 1 def test_assign_states_wraps_negative_angles(): @@ -526,10 +380,20 @@ def test_assign_states_wraps_negative_angles(): mol = MagicMock() mol.trajectory = [0, 1] + mol.residues = [MagicMock()] + mol.residues[0].atoms.indices = np.array([0, 1, 2, 3], dtype=int) uops.extract_fragment.return_value = mol angles = np.array([[-10.0], [10.0]], dtype=float) peaks = [[10.0, 350.0]] + dihedrals = ["D0"] + states_ua = {} + states_res = [] + flexible_ua = {} + flexible_res = [] + + dt._select_heavy_residue = MagicMock(return_value=mol) + dt._get_dihedrals = MagicMock(return_value=dihedrals) class _FakeDihedral: def __init__(self, _dihedrals): @@ -539,18 +403,23 @@ def run(self): return SimpleNamespace(results=SimpleNamespace(angles=angles)) with patch("CodeEntropy.levels.dihedrals.Dihedral", _FakeDihedral): - states, num_flex = dt._assign_states( + dt._assign_states( data_container=MagicMock(), - molecules=[0], - dihedrals=["D0"], - peaks=peaks, - start=0, - end=2, - step=1, + group_id=0, + molecules=[0, 1], + level_list=["united_atom", "residue"], + peaks_ua=[peaks], + peaks_res=peaks, + states_ua=states_ua, + states_res=states_res, + flexible_ua=flexible_ua, + flexible_res=flexible_res, ) - assert states == ["1", "0"] - assert num_flex == 1 + assert states_ua[(0, 0)] == ["1", "0", "1", "0"] + assert flexible_ua[(0, 0)] == 1 + assert states_res[0] == ["1", "0", "1", "0"] + assert flexible_res[0] == 1 def test_build_conformational_states_with_progress_handles_no_groups(): @@ -564,9 +433,6 @@ def test_build_conformational_states_with_progress_handles_no_groups(): data_container=MagicMock(), levels={}, groups={}, # empty - start=0, - end=1, - step=1, bin_width=30.0, progress=progress, ) @@ -592,9 +458,6 @@ def test_build_conformational_states_with_progress_skips_empty_molecule_group(): data_container=MagicMock(), levels=levels, groups=groups, - start=0, - end=1, - step=1, bin_width=30.0, progress=progress, ) @@ -602,7 +465,7 @@ def test_build_conformational_states_with_progress_skips_empty_molecule_group(): assert states_ua == {} assert len(states_res) == 1 assert flex_ua == {} - assert flex_res == [0] + assert flex_res == [] progress.update.assert_called_with(5, title="Group 0 (empty)") progress.advance.assert_called_with(5) @@ -619,20 +482,49 @@ def test_build_conformational_states_with_progress_updates_title_per_group(monke uops.extract_fragment.return_value = MagicMock(trajectory=[0]) - monkeypatch.setattr(dt, "_collect_dihedrals_for_group", lambda **kw: ([], [])) - monkeypatch.setattr(dt, "_collect_peaks_for_group", lambda **kw: ([], [])) - monkeypatch.setattr(dt, "_assign_states_for_group", lambda **kw: None) - dt.build_conformational_states( data_container=MagicMock(), levels=levels, groups=groups, - start=0, - end=1, - step=1, bin_width=30.0, progress=progress, ) progress.update.assert_any_call(9, title="Group 1") progress.advance.assert_called_with(9) + + +def test_process_dihedral_phi(): + uops = MagicMock() + dt = ConformationStateBuilder(universe_operations=uops) + + dihedral_results = MagicMock() + dihedral_results.results.angles = [[0, 1, 2], [3, 4, 5]] + num_dihedrals = 3 + number_frames = 2 + phi_values = {} + + phi_values = dt._process_dihedral_phi( + dihedral_results, num_dihedrals, number_frames, phi_values + ) + + assert len(phi_values) == 3 + assert phi_values[0] == [0, 3] + + +def test_process_dihedral_phi_negative(): + uops = MagicMock() + dt = ConformationStateBuilder(universe_operations=uops) + + dihedral_results = MagicMock() + dihedral_results.results.angles = [[0, 1, 2], [-3, 4, 5]] + num_dihedrals = 3 + number_frames = 2 + phi_values = {} + + phi_values = dt._process_dihedral_phi( + dihedral_results, num_dihedrals, number_frames, phi_values + ) + + assert len(phi_values) == 3 + assert phi_values[0] == [0, 357] diff --git a/tests/unit/CodeEntropy/levels/test_level_dag_orchestration.py b/tests/unit/CodeEntropy/levels/test_level_dag_orchestration.py index 17a5a93..1895cd0 100644 --- a/tests/unit/CodeEntropy/levels/test_level_dag_orchestration.py +++ b/tests/unit/CodeEntropy/levels/test_level_dag_orchestration.py @@ -29,6 +29,7 @@ def test_execute_sets_default_axes_manager_once(): "start": 0, "end": 0, "step": 1, + "n_frames": 1, } dag._run_static_stage = MagicMock() @@ -64,7 +65,7 @@ def test_run_frame_stage_iterates_selected_frames_and_reduces_each(): u = MagicMock() u.trajectory = [ts0, ts1] - shared = {"reduced_universe": u, "start": 0, "end": 2, "step": 1} + shared = {"reduced_universe": u, "start": 0, "end": 2, "step": 1, "n_frames": 2} dag._frame_dag = MagicMock() dag._frame_dag.execute_frame.side_effect = [ @@ -79,8 +80,6 @@ def test_run_frame_stage_iterates_selected_frames_and_reduces_each(): assert dag._frame_dag.execute_frame.call_count == 2 assert dag._reduce_one_frame.call_count == 2 - dag._frame_dag.execute_frame.assert_any_call(shared, 10) - dag._frame_dag.execute_frame.assert_any_call(shared, 11) def test_incremental_mean_handles_non_copyable_values(): @@ -295,7 +294,7 @@ def test_run_frame_stage_with_progress_creates_task_and_updates_titles(): u = MagicMock() u.trajectory = [ts0, ts1] - shared = {"reduced_universe": u, "start": 0, "end": 2, "step": 1} + shared = {"reduced_universe": u, "start": 0, "end": 2, "step": 1, "n_frames": 2} dag._frame_dag = MagicMock() dag._frame_dag.execute_frame.return_value = { @@ -310,8 +309,6 @@ def test_run_frame_stage_with_progress_creates_task_and_updates_titles(): dag._run_frame_stage(shared, progress=progress) progress.add_task.assert_called_once() - progress.update.assert_any_call(77, title="Frame 10") - progress.update.assert_any_call(77, title="Frame 11") assert progress.advance.call_count == 2 @@ -324,9 +321,7 @@ def test_run_frame_stage_with_negative_end_computes_total_frames(): shared = { "reduced_universe": u, - "start": 0, - "end": -1, - "step": 1, + "n_frames": 10, } dag._frame_dag = MagicMock() @@ -343,39 +338,6 @@ def test_run_frame_stage_with_negative_end_computes_total_frames(): progress.add_task.assert_called_once() _, kwargs = progress.add_task.call_args - assert kwargs["total"] == 9 - - assert progress.advance.call_count == 9 - - -def test_run_frame_stage_progress_total_frames_falls_back_to_none_on_error(): - - dag = LevelDAG() - - class BadTrajectory: - def __len__(self): - raise RuntimeError("boom") - - def __getitem__(self, item): - return [] - - u = type("U", (), {})() - u.trajectory = BadTrajectory() - - shared = { - "reduced_universe": u, - "start": 0, - "end": 10, - "step": 1, - } - - dag._frame_dag = MagicMock() - dag._reduce_one_frame = MagicMock() - - progress = MagicMock() - progress.add_task.return_value = 99 + assert kwargs["total"] == 10 - dag._run_frame_stage(shared, progress=progress) - - _, kwargs = progress.add_task.call_args - assert kwargs["total"] is None + assert progress.advance.call_count == 10 diff --git a/tests/unit/CodeEntropy/levels/test_level_dag_reduction.py b/tests/unit/CodeEntropy/levels/test_level_dag_reduction.py index 5c8c471..5b00f40 100644 --- a/tests/unit/CodeEntropy/levels/test_level_dag_reduction.py +++ b/tests/unit/CodeEntropy/levels/test_level_dag_reduction.py @@ -75,7 +75,7 @@ def test_run_frame_stage_calls_execute_frame_for_each_ts(simple_ts_list): u = MagicMock() u.trajectory = simple_ts_list - shared = {"reduced_universe": u, "start": 0, "end": 3, "step": 1} + shared = {"reduced_universe": u, "start": 0, "end": 3, "step": 1, "n_frames": 3} dag._frame_dag = MagicMock() dag._frame_dag.execute_frame.side_effect = lambda shared_data, frame_index: { diff --git a/tests/unit/CodeEntropy/levels/test_neighbors.py b/tests/unit/CodeEntropy/levels/test_neighbors.py index a9f997d..c7211d5 100644 --- a/tests/unit/CodeEntropy/levels/test_neighbors.py +++ b/tests/unit/CodeEntropy/levels/test_neighbors.py @@ -33,10 +33,11 @@ def test_raises_error_unknown_search_type(): universe.trajectory.__len__.return_value = 2 levels = {0: ["united_atom"]} groups = {0: [0]} + n_frames = 2 search_type = "weird" with pytest.raises(ValueError): - neighbors.get_neighbors(universe, levels, groups, search_type) + neighbors.get_neighbors(universe, levels, groups, n_frames, search_type) def test_average_number_neighbors_RAD(): @@ -46,11 +47,12 @@ def test_average_number_neighbors_RAD(): universe.trajectory.__len__.return_value = 2 levels = {0: ["united_atom"]} groups = {0: [0]} + n_frames = 2 search_type = "RAD" neighbors._search.get_RAD_neighbors = MagicMock(side_effect=[[1, 2, 3], [1, 3]]) - result = neighbors.get_neighbors(universe, levels, groups, search_type) + result = neighbors.get_neighbors(universe, levels, groups, n_frames, search_type) assert result == {0: np.float64(2.5)} @@ -62,11 +64,12 @@ def test_average_number_neighbors_grid(): universe.trajectory.__len__.return_value = 2 levels = {0: ["united_atom"]} groups = {0: [0]} + n_frames = 2 search_type = "grid" neighbors._search.get_grid_neighbors = MagicMock(side_effect=[[1, 2, 3], [1, 3]]) - result = neighbors.get_neighbors(universe, levels, groups, search_type) + result = neighbors.get_neighbors(universe, levels, groups, n_frames, search_type) assert result == {0: np.float64(2.5)} @@ -78,13 +81,14 @@ def test_average_number_neighbors_RAD_multiple(): universe.trajectory.__len__.return_value = 2 levels = {0: ["united_atom"]} groups = {0: [0, 1]} + n_frames = 2 search_type = "RAD" neighbors._search.get_RAD_neighbors = MagicMock( side_effect=[[1, 2, 3, 5], [1, 3], [2, 3, 4, 5], [3, 5]] ) - result = neighbors.get_neighbors(universe, levels, groups, search_type) + result = neighbors.get_neighbors(universe, levels, groups, n_frames, search_type) assert result == {0: np.float64(3.0)} diff --git a/tests/unit/CodeEntropy/levels/test_search.py b/tests/unit/CodeEntropy/levels/test_search.py index 30996e8..65a9ec0 100644 --- a/tests/unit/CodeEntropy/levels/test_search.py +++ b/tests/unit/CodeEntropy/levels/test_search.py @@ -105,7 +105,7 @@ def test_get_RAD_neighbors_returns_array(search): universe.atoms.fragments = [frag1, frag2, frag3] - result = search.get_RAD_neighbors(universe, mol_id=0) + result = search.get_RAD_neighbors(universe, mol_id=0, timestep=0) assert isinstance(result, np.ndarray) @@ -123,7 +123,7 @@ def test_rad_pbc_path_triggers_wrapping(search): universe.atoms.fragments = [frag1, frag2] - result = search.get_RAD_neighbors(universe, mol_id=0) + result = search.get_RAD_neighbors(universe, mol_id=0, timestep=0) assert isinstance(result, np.ndarray) @@ -154,6 +154,7 @@ def test_get_grid_neighbors_united_atom(search): universe, mol_id=0, highest_level="united_atom", + timestep=0, ) mock_search.assert_called_once() @@ -189,6 +190,7 @@ def test_get_grid_neighbors_residue(search): universe, mol_id=0, highest_level="other", + timestep=0, ) mock_search.assert_called_once() @@ -214,6 +216,7 @@ def test_get_grid_neighbors_selection_string(search): universe, mol_id=0, highest_level="united_atom", + timestep=0, ) universe.select_atoms.assert_called_once_with("index 3:7")