diff --git a/hippyflow/modeling/__init__.py b/hippyflow/modeling/__init__.py index f8d5378..179b1e9 100644 --- a/hippyflow/modeling/__init__.py +++ b/hippyflow/modeling/__init__.py @@ -17,7 +17,7 @@ from .cMinimization import ConstrainedNSolver -from .dataGenerator import DataGenerator, compress_dataset +from .dataGenerator import DataGenerator, compress_dataset, data_generator_settings from .controlJacobian import ObservableControlJacobian diff --git a/hippyflow/modeling/dataGenerator.py b/hippyflow/modeling/dataGenerator.py index 74a42f4..8f9fc21 100644 --- a/hippyflow/modeling/dataGenerator.py +++ b/hippyflow/modeling/dataGenerator.py @@ -133,11 +133,11 @@ def generate(self, n_samples, derivatives = (0,0),\ self.u.zero() print('reset init guess') self.prior.sample(self.noise,self.m) - print('sampled m', self.m.get_local()) + # print('sampled m', self.m.get_local()) if self.control_distribution is not None: self.control_distribution.sample(self.z) - print('sampled z', self.z.get_local()) + # print('sampled z', self.z.get_local()) x = [self.u,self.m,None,self.z] else: x = [self.u,self.m,None] @@ -234,9 +234,9 @@ def generate(self, n_samples, derivatives = (0,0),\ exceptions_count += 1 if self.settings['save_failed_solves']: os.makedirs(data_dir+'/skipped/',exist_ok=True) - np.save(data_dir+'skipped/m_sample_'+str(exceptions_count)+'.npy',self.m.get_local()) + np.save(data_dir+'/skipped/m_sample_'+str(exceptions_count)+'.npy',self.m.get_local()) if self.z is not None: - np.save(data_dir+'skipped/z_sample_'+str(exceptions_count)+'.npy',self.z.get_local()) + np.save(data_dir+'/skipped/z_sample_'+str(exceptions_count)+'.npy',self.z.get_local()) print('Issue perhaps with the forward solve, moving on.') print(f"Total exceptions: {exceptions_count}")