Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mschwoer committed Sep 20, 2024
1 parent f53ec19 commit 1dcfd53
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
5 changes: 1 addition & 4 deletions alphastats/plots/VolcanoPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,7 @@ def _sam(self): # TODO duplicated?

transposed = self.mat.transpose()

if (
self.dataset.preprocessing_info[PreprocessingStateKeys.LOG2_TRANSFORMED]
is None
):
if self.preprocessing_info[PreprocessingStateKeys.LOG2_TRANSFORMED] is None:
# needs to be lpog2 transformed for fold change calculations
transposed = transposed.transform(lambda x: np.log2(x))

Expand Down
5 changes: 1 addition & 4 deletions alphastats/statistics/DifferentialExpressionAnalysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ def _sam(self) -> pd.DataFrame: # TODO duplicated?

transposed = self.mat.transpose()

if (
self.dataset.preprocessing_info[PreprocessingStateKeys.LOG2_TRANSFORMED]
is None
):
if self.preprocessing_info[PreprocessingStateKeys.LOG2_TRANSFORMED] is None:
# needs to be lpog2 transformed for fold change calculations
transposed = transposed.transform(lambda x: np.log2(x))

Expand Down

0 comments on commit 1dcfd53

Please sign in to comment.