Merging Fails

[Former user]

Merging of the 2 models fails

[Bart Bogaerts]

Also: implementing merging sorts!

[Broes De Cat]

Is dit een nieuwe bug bart, of wat is het probleem juist?

[Bart Bogaerts]

Dit is een nieuwe bug: in deze file gebeurt er een merge van structuren, maar die gebeurt niet goed

(mergen van een volledig unknown symbool met dit zelfde symbool volledig false versie daarvan geeft een volledig unknown versie -> dit moest volledig false zjin, want dat is meer precies).

Mijn opmerking: we moeten dan meteen ook implementeren dat sorts gemerged (unie) worden. Dit is niet veel werk

[Bart Bogaerts]

implemented merging sorts

Previously, when structures were merged, the sorts were left untouched. This resulted in a behavior depending on the order we merged. Now I implemented that sorts also get merged. Different sorts can result in a behaviour where a relation was two-valued before merging, but became threevalued after merging. (this is NOT new, see #270) I resolved this by adding warnings whenever a relation is no longer two-valued because of adding new elements to a sort.

This fixes #270 (which was in fact no bug)

→ <<cset 77da2d2813a9>>

[Bart Bogaerts]

implemented merging sorts

Previously, when structures were merged, the sorts were left untouched. This resulted in a behavior depending on the order we merged. Now I implemented that sorts also get merged. Different sorts can result in a behaviour where a relation was two-valued before merging, but became threevalued after merging. (this is NOT new, see #270) I resolved this by adding warnings whenever a relation is no longer two-valued because of adding new elements to a sort.

This fixes #270 (which was in fact no bug)

→ <<cset 77da2d2813a9>>