From 6babe1e84c5b3d868dbbf503f1e29a303e0cff59 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:09:29 +0800 Subject: [PATCH] Make use of enum string --- api/s23_options_util.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index c8c8234..ce4aac2 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -350,15 +350,15 @@ def generate_v2(cs: ChangeSet) -> ChangeSet: if key != 'QUALITY_MODEL' and key != 'DEMAND_MODEL': cs_v2 |= { map[key] : op[key] } elif key == 'QUALITY_MODEL': - if str(op[key]).upper() == 'TRACE' and 'TRACE_NODE' in op.keys(): - cs_v2 |= { map[key] : f"TRACE {op['TRACE_NODE']}" } + if str(op[key]).upper() == OPTION_QUALITY_TRACE and 'TRACE_NODE' in op.keys(): + cs_v2 |= { map[key] : f"{OPTION_QUALITY_TRACE} {op['TRACE_NODE']}" } else: cs_v2 |= { map[key] : str(op[key]).upper() } elif key == 'DEMAND_MODEL': - if op[key] == 'FIXED': - cs_v2 |= { map[key] : 'DDA' } + if op[key] == OPTION_V3_DEMAND_MODEL_FIXED: + cs_v2 |= { map[key] : OPTION_DEMAND_MODEL_DDA } else: - cs_v2 |= { map[key] : 'PDA' } + cs_v2 |= { map[key] : OPTION_DEMAND_MODEL_PDA } if len(cs_v2) > 0: cs_v2 |= g_update_prefix | { 'type' : 'option' } @@ -387,10 +387,10 @@ def generate_v3(cs: ChangeSet) -> ChangeSet: tokens = str(op[key]).split() if len(tokens) >= 1: cs_v3 |= { map[key] : tokens[0].upper() } - if tokens[0].upper() == 'TRACE' and len(tokens) >= 2: + if tokens[0].upper() == OPTION_QUALITY_TRACE and len(tokens) >= 2: cs_v3 |= { 'TRACE_NODE' : tokens[1] } elif key == 'DEMAND MODEL': - cs_v3 |= { map[key] : 'POWER' } + cs_v3 |= { map[key] : OPTION_V3_DEMAND_MODEL_POWER } if len(cs_v3) > 0: cs_v3 |= g_update_prefix | { 'type' : 'option_v3' }