From 73c1594b8c25b9aa068c2416da716f198a82da6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Sun, 29 Mar 2020 10:14:52 +0200
Subject: [PATCH] Update problem.cpp

---
 src/problem/problem.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/problem/problem.cpp b/src/problem/problem.cpp
index 154fd4722..064a03a4d 100644
--- a/src/problem/problem.cpp
+++ b/src/problem/problem.cpp
@@ -1731,14 +1731,6 @@ bool Problem::check(int verbose_level) const
                         	if (found_here) cout << " Fo" << Fo->id();
                             found 		= found || found_here;
 
-                            // Find in Captures of the constrained Frame
-                            for (auto FoC : Fo->getCaptureList())
-                            {
-                            	sb_vec 		= FoC->getStateBlockVec();
-                            	found_here 	= (std::find(sb_vec.begin(), sb_vec.end(), sb) != sb_vec.end());
-                            	if (found_here) cout << " FoC" << FoC->id();
-                            	found 		= found || found_here;
-                            }
                         }
 
                         // find in constrained Capture
@@ -1750,6 +1742,16 @@ bool Problem::check(int verbose_level) const
                             found 		= found || found_here;
                         }
 
+                        // Find in other Captures of the constrained Frame
+                        if (!found_here && Fo)
+                            for (auto FoC : Fo->getCaptureList())
+                            {
+                            	sb_vec 		= FoC->getStateBlockVec();
+                            	found_here 	= (std::find(sb_vec.begin(), sb_vec.end(), sb) != sb_vec.end());
+                            	if (found_here) cout << " FoC" << FoC->id();
+                            	found 		= found || found_here;
+                            }
+
                         // find in constrained Feature
                         if (fo)
                         {
-- 
GitLab