Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / architecture / morpho.lib

diff --git a/architecture/morpho.lib b/architecture/morpho.lib
index fc24c6a..5c42861 100644 (file)
--- a/architecture/morpho.lib
+++ b/architecture/morpho.lib
@@ -54,7 +54,7 @@ threshold(x, low, high) = _ <: (_, (low : vectorize(x)) : >), (_, (high : vector
 
 //licenceplate(x, y) = _ <: (opening_line(x, y, 15), closing_line(x, y, 8) : threshold(x, 1, 50), threshold(x, 150, 255) : and : opening_column(x, y, 4) : opening_line(x, y, 4) : dilations_square(x, y, 2)), _ : and;
 
-licenceplate(x, y, o1, c2, t3, t4, t5, t6, o7, o8, d9) = _ <: (opening_line(x, y, o1), closing_line(x, y, c2) : threshold(x, t3, t4), threshold(x, t5, t6) : and : opening_column(x, y, o7) : opening_line(x, y, o8) : dilations_square(x, y, d9)), _ : and;
+licenceplate(x, y, o1, c2, t3, t4, t5, t6, o7, o8, d9, d10) = _ <: (opening_line(x, y, o1), closing_line(x, y, c2) : threshold(x, t3, t4), threshold(x, t5, t6) : and : opening_column(x, y, o7) : opening_line(x, y, o8) : dilations_square(x, y, d9) : dilations_line(x, y, d10)), _ : and;
 
 //licenceplate(x, y) = _ <: (opening_line(x, y, 4), closing_line(x, y, 2) : threshold(x, 1, 50), threshold(x, 150, 255) : and : opening_column(x, y, 4) : opening_line(x, y, 4) : dilations_square(x, y, 4)), _ : and;
 
@@ -62,6 +62,6 @@ licenceplate(x, y, o1, c2, t3, t4, t5, t6, o7, o8, d9) = _ <: (opening_line(x, y
 //process = erosions(8, 8, 3);
 //process = open(8, 8, 2);
 //process = close(8, 8, 5);
-//process = licenceplate(100, 50, 15, 8, 1, 50, 150, 255, 4, 4, 2);
+//process = licenceplate(4, 4, 15, 8, 1, 50, 150, 255, 4, 4, 2, 20);