From 71e0c5a556e62e568ca8cab8bcb2b45d96662733 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Mon, 9 Sep 2019 17:55:01 +0200
Subject: [PATCH] [apps/shared/expression_model_store] Better assertions

---
 apps/shared/expression_model_store.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/shared/expression_model_store.cpp b/apps/shared/expression_model_store.cpp
index 918266456..031b393d3 100644
--- a/apps/shared/expression_model_store.cpp
+++ b/apps/shared/expression_model_store.cpp
@@ -54,13 +54,12 @@ int ExpressionModelStore::numberOfModelsSatisfyingTest(ModelTest test) const {
 }
 
 Ion::Storage::Record ExpressionModelStore::recordSatisfyingTestAtIndex(int i, ModelTest test) const {
-  assert(i >= 0 && i < numberOfDefinedModels());
+  assert(0 <= i && i < numberOfModelsSatisfyingTest(test));
   int index = 0;
   int currentModelIndex = 0;
   Ion::Storage::Record r = recordAtIndex(currentModelIndex++);
   ExpressionModelHandle * m = privateModelForRecord(r);
   while (!m->isNull()) {
-    assert(currentModelIndex <= numberOfModels());
     if (test(m)) {
       if (i == index) {
         return r;