From af53ae9dd94a6dedca77cacd65d804367915b26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Mon, 9 Nov 2020 11:15:35 +0100
Subject: [PATCH] Import from Bin:a1af7a0 Src:4d6702673 farith:a93db57
---
Src/COLIBRI/solve.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Src/COLIBRI/solve.pl b/Src/COLIBRI/solve.pl
index 4f7302cf6..d032e51f1 100644
--- a/Src/COLIBRI/solve.pl
+++ b/Src/COLIBRI/solve.pl
@@ -2129,13 +2129,13 @@ unfold_int_expr(EA #\= EB,D,Cstr,Type0,R) ?-
unfold_int_expr(alldiff(Type,L),D,Cstr,Bool,R) :-
ND is D + 1,
Bool = bool,
- (real_type(Type,_) ->
+ (real_type(Type,IType) ->
Real = 1
; true),
(foreach(E,L),
foreach(RE,NL),
fromto(true,I,O,CL),
- param(NType,Real,ND,R) do
+ param(Type,Real,ND,R) do
(var(Real) ->
unfold_int_expr(E,ND,CE,Type,RE)
; unfold_real_expr(E,ND,CE,Type,RE)),
@@ -2144,8 +2144,8 @@ unfold_int_expr(alldiff(Type,L),D,Cstr,Bool,R) :-
!,
int_vars(bool,R),
insert_dep_inst(dep(R,D,NL)),
- (nonvar(Real) ->
- IType = real
+ (nonvar(IType) ->
+ true
; ((Type = sort(_);
Type == rnd;
Type = array(_,_))
--
GitLab