Refactor ref_model rank checking and add level check to argmax

Signed-off-by: Jerry Ge <jerry.ge@arm.com>
Change-Id: Iad035b31d5e5e83040068e6311501490765bfff7

1 files changed, 7 insertions, 11 deletions

diff --git a/reference_model/src/graph_node.h b/reference_model/src/graph_node.h
index 3433192..aafc07f 100644
--- a/reference_model/src/graph_node.h
+++ b/reference_model/src/graph_node.h
@@ -270,20 +270,16 @@ protected:
 
     int setRequiredRank(const int min, const int max = -1)
     {
-        if (max == -1)
-        {
-            requiredRankMin = requiredRankMax = min;
-        }
-        else
+        requiredRankMin = min;
+        requiredRankMax = max;
+
+        if (requiredRankMin >= 0 && requiredRankMax >= 0)
         {
-            requiredRankMin = min;
-            requiredRankMax = max;
+            ASSERT_MSG(requiredRankMin <= requiredRankMax,
+                    "GraphNode::setRequiredRank: requiredRankMin %d must be <= requiredRankMax %d", requiredRankMin,
+                    requiredRankMax);
         }
 
-        ASSERT_MSG(requiredRankMin <= requiredRankMax,
-                   "GraphNode::setRequiredRank: requiredRankMin %d must be <= requiredRankMax %d", requiredRankMin,
-                   requiredRankMax);
-
         return 0;
     }