From 3c6e827413dcf03fbf16ff5b270cc02d8c33fbf1 Mon Sep 17 00:00:00 2001 From: "Mads M. Pedersen" <mmpe@dtu.dk> Date: Thu, 11 May 2017 09:53:34 +0200 Subject: [PATCH 1/2] dlc highlevel support for flex --- wetb/dlc/high_level.py | 5 +++-- wetb/dlc/tests/test_files/DLC_test_flex.xlsx | Bin 0 -> 18215 bytes .../dlc12_wsp04_wdir350_s3001.int | 0 wetb/dlc/tests/test_high_level.py | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 wetb/dlc/tests/test_files/DLC_test_flex.xlsx create mode 100644 wetb/dlc/tests/test_files/res/dlc12_iec61400-1ed3/dlc12_wsp04_wdir350_s3001.int diff --git a/wetb/dlc/high_level.py b/wetb/dlc/high_level.py index 418de910..0edfa43b 100644 --- a/wetb/dlc/high_level.py +++ b/wetb/dlc/high_level.py @@ -231,10 +231,11 @@ class DLCHighLevel(object): fatigue_dlcs = self.dlc_df[['F' in str(l).upper() for l in self.dlc_df['load']]]['dlc'] if len(fatigue_dlcs) == 0: return {} + ext = getattr(self, 'res_ext', ".sel") if isinstance(files, list): pass elif not hasattr(self, "res_folder") or self.res_folder == "": - files = glob.glob(os.path.join(self.res_path, "*.sel")) + glob.glob(os.path.join(self.res_path, "*/*.sel")) + files = glob.glob(os.path.join(self.res_path, "*"+ext)) + glob.glob(os.path.join(self.res_path, "*/*"+ext)) else: files = [] @@ -244,7 +245,7 @@ class DLCHighLevel(object): folder = self.res_folder % dlc_id else: folder = self.res_folder - files.extend(glob.glob(os.path.join(self.res_path , folder, "*.sel"))) + files.extend(glob.glob(os.path.join(self.res_path , folder, "*"+ext))) keys = list(zip(*self.dist_value_keys))[1] fmt = self.format_tag_value tags = [[fmt(tag.replace(key, "")) for tag, key in zip(os.path.basename(f).split("_"), keys)] for f in files] diff --git a/wetb/dlc/tests/test_files/DLC_test_flex.xlsx b/wetb/dlc/tests/test_files/DLC_test_flex.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cebcdd2ae3eeff59369e4a1950700f0679e3883a GIT binary patch literal 18215 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 literal 0 HcmV?d00001 diff --git a/wetb/dlc/tests/test_files/res/dlc12_iec61400-1ed3/dlc12_wsp04_wdir350_s3001.int b/wetb/dlc/tests/test_files/res/dlc12_iec61400-1ed3/dlc12_wsp04_wdir350_s3001.int new file mode 100644 index 00000000..e69de29b diff --git a/wetb/dlc/tests/test_high_level.py b/wetb/dlc/tests/test_high_level.py index 473e81bd..a8dbb083 100644 --- a/wetb/dlc/tests/test_high_level.py +++ b/wetb/dlc/tests/test_high_level.py @@ -56,6 +56,11 @@ class TestDLCHighLevel(unittest.TestCase): self.assertEqual(os.path.abspath(f), os.path.abspath(testfilepath + 'res/dlc31_iec61400-1ed3/dlc31_wsp25_wdir000_s0000.sel')) self.assertAlmostEqual(h, 0.0087201928 * 1 * (50 / 1100) * 20 * 365 * 24) + def test_file_dict_flex(self): + + dlc_hl = DLCHighLevel(testfilepath + 'DLC_test_flex.xlsx') + self.assertEqual(dlc_hl.files_dict()[12][4][350]['files'], ['C:/mmpe/programming/python/WindEnergyToolbox/wetb/dlc/tests\\test_files\\res\\dlc12_iec61400-1ed3\\dlc12_wsp04_wdir350_s3001.int']) + def test_dlc_lst(self): self.assertEqual(self.dlc_hl.dlc_lst(), ['12', '13', '14', '31']) -- GitLab From 099f60526575749c8475ff23792169245a2880d9 Mon Sep 17 00:00:00 2001 From: "Mads M. Pedersen" <mmpe@dtu.dk> Date: Thu, 11 May 2017 09:56:53 +0200 Subject: [PATCH 2/2] dlc highlevel support for flex --- wetb/dlc/tests/test_high_level.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wetb/dlc/tests/test_high_level.py b/wetb/dlc/tests/test_high_level.py index a8dbb083..1af3b134 100644 --- a/wetb/dlc/tests/test_high_level.py +++ b/wetb/dlc/tests/test_high_level.py @@ -57,9 +57,10 @@ class TestDLCHighLevel(unittest.TestCase): self.assertAlmostEqual(h, 0.0087201928 * 1 * (50 / 1100) * 20 * 365 * 24) def test_file_dict_flex(self): - dlc_hl = DLCHighLevel(testfilepath + 'DLC_test_flex.xlsx') - self.assertEqual(dlc_hl.files_dict()[12][4][350]['files'], ['C:/mmpe/programming/python/WindEnergyToolbox/wetb/dlc/tests\\test_files\\res\\dlc12_iec61400-1ed3\\dlc12_wsp04_wdir350_s3001.int']) + file_lst = dlc_hl.files_dict()[12][4][350]["files"] + self.assertEqual(len(file_lst),1) + self.assertTrue(file_lst[0].endswith(".int")) def test_dlc_lst(self): -- GitLab