From d4f4ab8e1e79c6be7300ad112fd32be0313989c8 Mon Sep 17 00:00:00 2001
From: kohlhaasrebecca <rebecca.kohlhaas@outlook.com>
Date: Fri, 13 Dec 2024 10:46:46 +0100
Subject: [PATCH] Removing more remains of rebase
---
tests/test_PolynomialChaosEmulator.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/test_PolynomialChaosEmulator.py b/tests/test_PolynomialChaosEmulator.py
index d67fe0ec1..9ce310663 100644
--- a/tests/test_PolynomialChaosEmulator.py
+++ b/tests/test_PolynomialChaosEmulator.py
@@ -887,8 +887,6 @@ def test_calculate_sobol_pca():
mm.fit([[0.2], [0.8]], {'Z': [[0.4, 0.4], [0.5, 0.6]]})
sobol, totalsobol = mm.calculate_sobol({'Z': np.array([[0.4, 0.4], [0.5, 0.6]])})
# TODO are there theory-related checks that could be applied here?
-<<<<<<< HEAD
-=======
def test_calculate_sobol_pcanoy():
"""
@@ -906,4 +904,3 @@ def test_calculate_sobol_pcanoy():
mm.calculate_sobol()
assert str(excinfo.value) == ("Calculation of Sobol' indices with PCA expects training outputs, but none are given.")
->>>>>>> fb608a8b17595e3ddbb737043787e6d28266d003
--
GitLab