Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solved installation problems #8

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

Solved installation problems #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
008143c
solve installation problems
Vokturz Mar 30, 2022
a845df6
Solved problem with singular matrix
Vokturz Mar 30, 2022
b363d99
Solve deprecation warning
Vokturz Mar 30, 2022
44d7423
singular matrices should not be allowed
Vokturz Apr 18, 2022
3fd5fcd
remove warning from deprecated package imp
Vokturz Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cosmoabc/ABC_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def read_input(filename):
params['dist_dim'] = int(params_ini['dist_dim'][0])

#functions
from distances import distance_GRBF
from .distances import distance_GRBF
dispatcher = {'flat_prior': flat_prior,
'gaussian_prior': gaussian_prior, 'beta_prior': beta_prior,
'distance_quantiles': distance_quantiles,
Expand Down
3 changes: 2 additions & 1 deletion cosmoabc/ABC_sampler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,8 @@ def UpdateWeights(self, W, previous_particle_system,
indx = len(self.params['param_to_fit'])
denominator = sum(W[i3]*multivariate_normal.pdf(
current_particle_system[i4][:indx],
previous_particle_system[i3][:indx], cov=cov1)
previous_particle_system[i3][:indx],
cov=cov1, allow_singular=False)
for i3 in range(len(W)))

new_weights.append(nominator/denominator)
Expand Down
4 changes: 2 additions & 2 deletions cosmoabc/bin/continue_ABC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"""

import argparse
import imp
import importlib.machinery as imp

from cosmoabc.distances import distance_quantiles, distance_GRBF
from cosmoabc.priors import flat_prior, gaussian_prior, beta_prior
Expand All @@ -45,7 +45,7 @@ def main(args):
if user_input['path_to_obs'] == 'None':
raise IOError('It is not possible to continue a process without determining a static data set.')

m1 = imp.load_source(args.functions[:-3], args.functions)
m1 = imp.SourceFileLoader(args.functions[:-3], args.functions).load_module()

user_input['simulation_func'] = getattr(m1, user_input['simulation_func'][0])

Expand Down
4 changes: 2 additions & 2 deletions cosmoabc/bin/run_ABC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"""

import argparse
import imp
import importlib.machinery as imp

from cosmoabc.distances import distance_quantiles, distance_GRBF
from cosmoabc.priors import flat_prior, gaussian_prior, beta_prior
Expand All @@ -42,7 +42,7 @@
def main( args ):

user_input = read_input(args.input)
m1 = imp.load_source(args.functions[:-3], args.functions)
m1 = imp.SourceFileLoader(args.functions[:-3], args.functions).load_module()

user_input['simulation_func'] = getattr(m1, user_input['simulation_func'][0])

Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def readme():
'scipy>=1.7.0',
'statsmodels>=0.12.2',
'matplotlib>=3.4.2',
'distribute',
'datetime'
],
scripts=['cosmoabc/bin/run_ABC.py', 'cosmoabc/bin/run_ABC_NumCosmo.py',
Expand Down