Skip to content

Commit

Permalink
Simplify evaluation of floats or ints
Browse files Browse the repository at this point in the history
Change-Id: Iec14fd023ded962ac5f4e26f8236cf26db642603
  • Loading branch information
si-23 committed Sep 8, 2023
1 parent ed7163a commit e8444fa
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions cmk/gui/graphing/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -770,8 +770,11 @@ def evaluate(
expression: MetricExpression | int | float,
translated_metrics: TranslatedMetrics,
) -> RPNExpression:
if isinstance(expression, (float, int)):
return _evaluate_literal(expression, translated_metrics)
if isinstance(expression, int):
return RPNExpression(float(expression), unit_info["count"], "#000000")

if isinstance(expression, float):
return RPNExpression(expression, unit_info[""], "#000000")

expression, explicit_unit_name, explicit_color = split_expression(expression)
rpn_expr_metric = stack_resolver(
Expand Down Expand Up @@ -917,15 +920,7 @@ def _operator_minmax(
return RPNExpression(v, unit, winner.color or loser.color)


def _evaluate_literal(
expression: int | float | str, translated_metrics: TranslatedMetrics
) -> RPNExpression:
if isinstance(expression, int):
return RPNExpression(float(expression), unit_info["count"], "#000000")

if isinstance(expression, float):
return RPNExpression(expression, unit_info[""], "#000000")

def _evaluate_literal(expression: str, translated_metrics: TranslatedMetrics) -> RPNExpression:
if expression not in translated_metrics:
try:
return RPNExpression(float(int(expression)), unit_info["count"], "#000000")
Expand Down

0 comments on commit e8444fa

Please sign in to comment.