Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
jameschapman19 committed Oct 26, 2023
2 parents 4201b4f + cb47e7c commit b52751d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
1 change: 0 additions & 1 deletion cca_zoo/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ def canonical_loadings_(
]
return self._canonical_loadings


def loadings_(self) -> List[np.ndarray]:
"""
Compute and return loadings_ for each view. These are cached for performance optimization.
Expand Down
13 changes: 10 additions & 3 deletions cca_zoo/datasets/simulated.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,16 @@ class JointData(BaseData):
Class for generating simulated data for a linear model with multiple representations.
"""

def __init__(self, view_features: List[int], latent_dims: int = 1, view_sparsity: Union[List[float], float] = None,
correlation: Union[List[float], float] = 0.99, structure: str = "random",
positive: Union[bool, List[bool]] = False, random_state: Union[int, np.random.RandomState] = None):
def __init__(
self,
view_features: List[int],
latent_dims: int = 1,
view_sparsity: Union[List[float], float] = None,
correlation: Union[List[float], float] = 0.99,
structure: str = "random",
positive: Union[bool, List[bool]] = False,
random_state: Union[int, np.random.RandomState] = None,
):
self.view_features = view_features
self.latent_dims = latent_dims
self.random_state = check_random_state(random_state)
Expand Down

0 comments on commit b52751d

Please sign in to comment.