updated the tests

UCL-CCS · Nov 19, 2020 · 15b2238 · 15b2238
1 parent f0e5abb
commit 15b2238
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 65 deletions.
diff --git a/tests/test_pce_analysis_results.py b/tests/test_pce_analysis_results.py
@@ -62,29 +62,6 @@ def data_vectors():
     df = pd.DataFrame(data)
     return sampler, df
 
-
-@pytest.fixture
-def data_vectors_2():
-    np.random.seed(10000000)
-    vary = {
-        "x1": cp.J(cp.Uniform(0.0, 1.0), cp.Uniform(0.0, 1.0)),
-        "x2": cp.Uniform(0.0, 1.0)
-    }
-    sampler = uq.sampling.SCSampler(vary)
-    data = {('run_id', 0): [], ('x1', 0): [], ('x1', 1): [], ('x2', 0): [],
-            ('g', 0): [], ('g', 1): [], ('g', 2): []}
-    for run_id, sample in enumerate(sampler):
-        data[('run_id', 0)].append(run_id)
-        data[('x1', 0)].append(sample['x1'][0])
-        data[('x1', 1)].append(sample['x1'][1])
-        data[('x2', 0)].append(sample['x2'])
-        data[('g', 0)].append(sample['x1'])
-        data[('g', 1)].append(sample['x2'])
-        data[('g', 2)].append(sample['x1'] + sample['x2'])
-    df = pd.DataFrame(data)
-    return sampler, df
-
-
 @pytest.fixture
 def results(data):
     # Post-processing analysis
@@ -103,15 +80,6 @@ def results_vectors(data_vectors):
     return results
 
 
-@pytest.fixture
-def results_vectors_2(data_vectors_2):
-    # Post-processing analysis
-    sampler, df = data_vectors
-    analysis = uq.analysis.SCAnalysis(sampler=sampler, qoi_cols=[('g', 0), ('g', 1), ('g', 2)])
-    results = analysis.analyse(df)
-    return results
-
-
 def test_results(results):
     assert(isinstance(results, PCEAnalysisResults))
     sobols_first_x1 = results._get_sobols_first('f', 'x1')

diff --git a/tests/test_sc_analysis_results.py b/tests/test_sc_analysis_results.py
@@ -62,29 +62,6 @@ def data_vectors():
     return sampler, df
 
 
-@pytest.fixture
-def data_vectors_2():
-    np.random.seed(10000000)
-    vary = {
-        "x1": cp.J(cp.Uniform(0.0, 1.0), cp.Uniform(0.0, 1.0)),
-        "x2": cp.Uniform(0.0, 1.0)
-    }
-    sampler = uq.sampling.SCSampler(vary)
-    data = {('run_id', 0): [], ('x1', 0): [], ('x1', 1): [], ('x2', 0): [],
-            ('g', 0): [], ('g', 1): [], ('g', 2): []}
-    for run_id, sample in enumerate(sampler):
-        import pdb; pdb.set_trace()
-        data[('run_id', 0)].append(run_id)
-        data[('x1', 0)].append(sample['x1'][0])
-        data[('x1', 1)].append(sample['x1'][1])
-        data[('x2', 0)].append(sample['x2'])
-        data[('g', 0)].append(sample['x1'])
-        data[('g', 1)].append(sample['x2'])
-        data[('g', 2)].append(sample['x1'] + sample['x2'])
-    df = pd.DataFrame(data)
-    return sampler, df
-
-
 @pytest.fixture
 def results(data):
     # Post-processing analysis
@@ -103,22 +80,13 @@ def results_vectors(data_vectors):
     return results
 
 
-@pytest.fixture
-def results_vectors_2(data_vectors_2):
-    # Post-processing analysis
-    sampler, df = data_vectors
-    analysis = uq.analysis.SCAnalysis(sampler=sampler, qoi_cols=[('g', 0), ('g', 1), ('g', 2)])
-    results = analysis.analyse(df)
-    return results
-
-
 def test_results(results):
     assert(isinstance(results, SCAnalysisResults))
     sobols_first_x1 = results._get_sobols_first('f', 'x1')
     sobols_first_x2 = results._get_sobols_first('f', 'x2')
     assert(sobols_first_x1 == pytest.approx(0.610242, 0.001))
     assert(sobols_first_x2 == pytest.approx(0.26096511, 0.001))
-    with pytest.raises(NotImplementedError):
+    with pytest.raises(RuntimeError):
         results.sobols_total()