From 900f502b6afc6b8ea6b4a70f24b2e3d6b0fae248 Mon Sep 17 00:00:00 2001 From: wperkins Date: Thu, 28 Dec 2023 22:30:00 +0000 Subject: [PATCH] Apply pre-commmit fixes --- scripts/contingency_native_psse.py | 1 + scripts/contingency_psse_native.py | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/contingency_native_psse.py b/scripts/contingency_native_psse.py index e4a04a49..7447d292 100644 --- a/scripts/contingency_native_psse.py +++ b/scripts/contingency_native_psse.py @@ -33,6 +33,7 @@ class Outage(enum.Enum): # Contingency # ------------------------------------------------------------- + @dataclass class Contingency: num: int diff --git a/scripts/contingency_psse_native.py b/scripts/contingency_psse_native.py index f5cbb79c..1e82be67 100644 --- a/scripts/contingency_psse_native.py +++ b/scripts/contingency_psse_native.py @@ -2,11 +2,12 @@ # ------------------------------------------------------------- # file: contingency_psse_pti.py # -# A hack script to convert PSS/E contingencies to ExaGO NATIVE +# A hack script to convert PSS/E contingencies to ExaGO NATIVE # ------------------------------------------------------------- # ------------------------------------------------------------- -import sys, os +import sys +import os from optparse import OptionParser from pyparsing import * import enum @@ -16,12 +17,14 @@ # ------------------------------------------------------------- program = os.path.basename(sys.argv[0]) + class Outage(enum.Enum): GEN = 1 BR = 2 TR = 3 LOAD = 4 + Name = Word(printables) intid = Word(nums) @@ -37,24 +40,24 @@ class Outage(enum.Enum): Unit = Keyword("UNIT", caseless=True) LineOutage = ( - Open.suppress() + Branch.suppress() + + Open.suppress() + Branch.suppress() + From.suppress() + Bus.suppress() + intid.setName("from_bus") + To.suppress() + Bus.suppress() + intid.setName("to_bus") + Circuit.suppress() + intid.setName("circuit") -).setParseAction(lambda t: (Outage.BR, t[0:]) ) +).setParseAction(lambda t: (Outage.BR, t[0:])) GenOutage = ( Remove.suppress() + Unit.suppress() + intid.setName("gen") + From.suppress() + Bus.suppress() + intid.setName("bus") -).setParseAction(lambda t: (Outage.GEN, t[0:]) ) +).setParseAction(lambda t: (Outage.GEN, t[0:])) Contingency = ( Keyword("CONTINGENCY", caseless=True).suppress() + Name + - OneOrMore( LineOutage | GenOutage ) + + OneOrMore(LineOutage | GenOutage) + Keyword("END", caseless=True).suppress() -).setParseAction(lambda t: { t[0] : t[1:] }) +).setParseAction(lambda t: {t[0]: t[1:]}) ContingencyList = OneOrMore(Contingency) @@ -109,4 +112,3 @@ class Outage(enum.Enum): output.write("%d,%d,0,0," % (int(typ.value), int(dat[1]))) output.write("'1 ',1,0,0.01\n") -