dan
/
HITs-Examples
mirror of https://github.com/nmvdw/HITs-Examples
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/nmvdw/HITs-Examples

This commit is contained in:
Niels 2017-08-03 12:24:39 +02:00
parent 7d74b45fc3 8a65852d1b
commit fec00177ad
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FiniteSets/disjunction.v
View File

@ -183,4 +183,4 @@ Section hPropLattice.
absorption_max_min := _ absorption_max_min := _
}. }.
End hPropLattice. End hPropLattice.

17
FiniteSets/fsets/properties_decidable.v
View File

@ -166,6 +166,23 @@ Section SetLattice.
split ; toBool. split ; toBool.
Defined. Defined.
<<<<<<< HEAD
=======
Instance lattice_fset : Lattice intersection (@U A) (@E A) :=
{
commutative_min := _ ;
commutative_max := _ ;
associative_min := _ ;
associative_max := _ ;
idempotent_min := _ ;
idempotent_max := _ ;
neutralL_max := _ ;
neutralR_max := _ ;
absorption_min_max := _ ;
absorption_max_min := _
}.
>>>>>>> 8a65852d1b39137898bddbaf7cf949bceeb4a574
End SetLattice. End SetLattice.
(* Comprehension properties *) (* Comprehension properties *)