fix new slu

actions.py

@@ -7,6 +7,8 @@ class Action:
         self.name = text
         for key, value in kwargs.items():
             setattr(self, key, value)
+    def __repr__(self):
+        return 'Action(%s)' % ', '.join(['%s=%s' % (str(x[0]), str(x[1])) for x in self.__dict__.items()])
 
 class ActionManager:
     def __init__(self, confirmer, highlighter, logger=log.ConsoleLogger()):

animate.py

@@ -24,10 +24,16 @@ def animate_value(callback, current, target, policy=DECELERATE, speed=32):
             current += delta
         if abs(current - target) < 2:
             current = target
+        current = target
         callback(current)
         timer = GObject.timeout_add(1000 / 25, lambda: animate_value(callback, current, target))
 
+scrolling = []
+
 def scroll_to(scrollview, widget):
+    global timer
+    if timer != None:
+        cancel()
     result = widget.translate_coordinates(scrollview.get_child().get_child(), 0, 0)
     if result:
         adj = scrollview.get_vadjustment()

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section0.txt

@@ -19,7 +19,7 @@
 16	17	dot	0	0
 17	18	two	0	0
 18	19	dot	0	0
-19	20	two	8	0
+19	20	two	7	0
 20
 0	21	phase	0	0
 21	22	of	0	0
@@ -30,7 +30,7 @@
 26	27	dot	0	0
 27	28	three	0	0
 28	29	dot	0	0
-29	30	three	24	0
+29	30	three	23	0
 30
 0	31	phase	0	0
 31	32	of	0	0
@@ -41,7 +41,7 @@
 36	37	dot	0	0
 37	38	four	0	0
 38	39	dot	0	0
-39	40	four	36	0
+39	40	four	35	0
 40
 0	41	phase	0	0
 41	42	of	0	0
@@ -52,7 +52,7 @@
 46	47	dot	0	0
 47	48	five	0	0
 48	49	dot	0	0
-49	50	five	53	0
+49	50	five	52	0
 50
 0	51	phase	0	0
 51	52	of	0	0
@@ -63,7 +63,7 @@
 56	57	dot	0	0
 57	58	six	0	0
 58	59	dot	0	0
-59	60	six	59	0
+59	60	six	58	0
 60
 0	61	phase	0	0
 61	62	of	0	0
@@ -74,7 +74,7 @@
 66	67	dot	0	0
 67	68	seven	0	0
 68	69	dot	0	0
-69	70	seven	212	0
+69	70	seven	210	0
 70
 0	71	phase	0	0
 71	72	of	0	0
@@ -85,5 +85,5 @@
 76	77	dot	0	0
 77	78	eight	0	0
 78	79	dot	0	0
-79	80	eight	217	0
+79	80	eight	214	0
 80

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section1.txt

-0	1	drop	4	0
-1	2	return	0	0
-1	2	<epsilon>	0	10
-2	3	to	0	0
-2	3	<epsilon>	0	10
-3	4	the	0	0
-3	4	<epsilon>	0	10
-4	5	center	0	0
-5	100
-0	5	<joker>	4	100
-5	6	<epsilon>	5	0
-6	100
-6	7	<epsilon>	6	0
-7	8	<epsilon>	7	0
-8
+0	1	<epsilon>	4	0
+1	100
+1	2	<epsilon>	5	0
+2	3	<epsilon>	6	0
+3

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section2.txt

-0	1	<epsilon>	6	0
-1	2	open	10	0
+0	1	<epsilon>	5	0
+1	2	open	9	0
 2	3	body	0	0
 2	3	<epsilon>	0	10
 3	4	system	0	0
 4	100
-1	4	<joker>	10	100
-4	5	<epsilon>	11	0
+1	4	<joker>	9	100
+4	5	<epsilon>	10	0
 5
-5	6	tell	12	0
+5	6	tell	11	0
 6	7	me	0	0
-7	6	tell	12	0
+7	6	tell	11	0
 7	100
-5	7	<joker>	12	100
-7	8	open	13	0
+5	7	<joker>	11	100
+7	8	open	12	0
 8	9	technical	0	0
 8	9	<epsilon>	0	10
 9	10	characteristics	0	0
-10	8	open	13	0
+10	8	open	12	0
 10	100
-7	10	<joker>	13	100
-10	11	yes	14	0
-11	11	yes	14	0
+7	10	<joker>	12	100
+10	11	yes	13	0
+11	11	yes	13	0
 11	100
-10	11	<joker>	14	100
-11	12	next	15	0
-12	12	next	15	0
+10	11	<joker>	13	100
+11	12	next	14	0
+12	12	next	14	0
 12	100
-11	12	<joker>	15	100
-12	13	download	16	0
-13	13	download	16	0
+11	12	<joker>	14	100
+12	13	download	15	0
+13	13	download	15	0
 13	100
-12	13	<joker>	16	100
-13	14	yes	17	0
-14	14	yes	17	0
+12	13	<joker>	15	100
+13	14	yes	16	0
+14	14	yes	16	0
 14	100
-13	14	<joker>	17	100
-14	15	read	18	0
-15	15	read	18	0
+13	14	<joker>	16	100
+14	15	read	17	0
+15	15	read	17	0
 15	100
-14	15	<joker>	18	100
-15	16	download	19	0
-16	16	download	19	0
+14	15	<joker>	17	100
+15	16	download	18	0
+16	16	download	18	0
 16	100
-15	16	<joker>	19	100
-16	17	accept	20	0
+15	16	<joker>	18	100
+16	17	accept	19	0
 17	18	terms	0	0
 17	18	<epsilon>	0	10
 18	19	and	0	0
@@ -55,10 +55,10 @@
 21	22	use	0	0
 21	22	<epsilon>	0	10
 22	23	next	0	0
-23	17	accept	20	0
+23	17	accept	19	0
 23	100
-16	23	<joker>	20	100
-23	24	install	21	0
+16	23	<joker>	19	100
+23	24	install	20	0
 24	25	the	0	0
 24	25	<epsilon>	0	10
 25	26	new	0	0
@@ -68,11 +68,11 @@
 27	28	of	0	0
 27	28	<epsilon>	0	10
 28	29	me	0	0
-29	24	install	21	0
+29	24	install	20	0
 29	100
-23	29	<joker>	21	100
-29	30	<epsilon>	22	0
+23	29	<joker>	20	100
+29	30	<epsilon>	21	0
 30	100
-30	31	<epsilon>	23	0
-31	32	<epsilon>	7	0
+30	31	<epsilon>	22	0
+31	32	<epsilon>	6	0
 32

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section2_exit.txt

@@ -2,5 +2,5 @@
 1	2	return	0	0
 2	3	to	0	0
 3	4	the	0	0
-4	5	center	9	0
+4	5	center	8	0
 5

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section3.txt

-0	1	<epsilon>	23	0
-1	2	import	26	0
+0	1	<epsilon>	22	0
+1	2	import	25	0
 2	3	body	0	0
 2	3	<epsilon>	0	10
 3	4	data	0	0
-4	2	import	26	0
+4	2	import	25	0
 4	100
-1	4	<joker>	26	100
-4	5	import	27	0
+1	4	<joker>	25	100
+4	5	import	26	0
 5	6	organic	0	0
 5	6	<epsilon>	0	10
 6	7	matter	0	0
 6	7	<epsilon>	0	10
 7	8	data	0	0
-8	5	import	27	0
+8	5	import	26	0
 8	100
-4	8	<joker>	27	100
-8	9	import	28	0
+4	8	<joker>	26	100
+8	9	import	27	0
 9	10	temperature	0	0
-10	9	import	28	0
+10	9	import	27	0
 10	100
-8	10	<joker>	28	100
-10	11	import	29	0
+8	10	<joker>	27	100
+10	11	import	28	0
 11	12	time	0	0
-12	11	import	29	0
+12	11	import	28	0
 12	100
-10	12	<joker>	29	100
-12	13	import	30	0
+10	12	<joker>	28	100
+12	13	import	29	0
 13	14	space	0	0
 13	14	<epsilon>	0	10
 14	15	data	0	0
-15	13	import	30	0
+15	13	import	29	0
 15	100
-12	15	<joker>	30	100
-15	16	import	31	0
+12	15	<joker>	29	100
+15	16	import	30	0
 16	17	position	0	0
-17	16	import	31	0
+17	16	import	30	0
 17	100
-15	17	<joker>	31	100
-17	18	import	32	0
+15	17	<joker>	30	100
+17	18	import	31	0
 18	19	body	0	0
 18	19	<epsilon>	0	10
 19	20	subsystems	0	0
-20	18	import	32	0
+20	18	import	31	0
 20	100
-17	20	<joker>	32	100
-20	21	import	33	0
+17	20	<joker>	31	100
+20	21	import	32	0
 21	22	state	0	0
-22	21	import	33	0
+22	21	import	32	0
 22	100
-20	22	<joker>	33	100
-22	23	<epsilon>	34	0
+20	22	<joker>	32	100
+22	23	<epsilon>	33	0
 23	100
-23	24	<epsilon>	35	0
-24	25	<epsilon>	7	0
+23	24	<epsilon>	34	0
+24	25	<epsilon>	6	0
 25

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section3_exit.txt

@@ -2,5 +2,5 @@
 1	2	return	0	0
 2	3	to	0	0
 3	4	the	0	0
-4	5	center	25	0
+4	5	center	24	0
 5

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section4.txt

-0	1	<epsilon>	35	0
-1	2	open	38	0
+0	1	<epsilon>	34	0
+1	2	open	37	0
 2	3	access	0	0
 2	3	<epsilon>	0	10
 3	4	to	0	0
@@ -8,10 +8,10 @@
 4	5	<epsilon>	0	10
 5	6	functions	0	0
 6	100
-1	6	<joker>	38	100
-6	7	<epsilon>	39	0
+1	6	<joker>	37	100
+6	7	<epsilon>	38	0
 7
-7	8	import	40	0
+7	8	import	39	0
 8	9	body	0	0
 8	9	<epsilon>	0	10
 9	10	functions	0	0
@@ -19,46 +19,46 @@
 10	11	space	0	0
 10	11	<epsilon>	0	10
 11	12	localization	0	0
-12	8	import	40	0
+12	8	import	39	0
 12	100
-7	12	<joker>	40	100
-12	13	import	41	0
+7	12	<joker>	39	100
+12	13	import	40	0
 13	14	body	0	0
 13	14	<epsilon>	0	10
 14	15	functions	0	0
 14	15	<epsilon>	0	10
 15	16	sensations	0	0
-16	13	import	41	0
+16	13	import	40	0
 16	100
-12	16	<joker>	41	100
-16	17	import	42	0
+12	16	<joker>	40	100
+16	17	import	41	0
 17	18	body	0	0
 17	18	<epsilon>	0	10
 18	19	functions	0	0
 18	19	<epsilon>	0	10
 19	20	passion	0	0
-20	17	import	42	0
+20	17	import	41	0
 20	100
-16	20	<joker>	42	100
-20	21	import	43	0
+16	20	<joker>	41	100
+20	21	import	42	0
 21	22	body	0	0
 21	22	<epsilon>	0	10
 22	23	functions	0	0
 22	23	<epsilon>	0	10
 23	24	concentration	0	0
-24	21	import	43	0
+24	21	import	42	0
 24	100
-20	24	<joker>	43	100
-24	25	import	44	0
+20	24	<joker>	42	100
+24	25	import	43	0
 25	26	body	0	0
 25	26	<epsilon>	0	10
 26	27	functions	0	0
 26	27	<epsilon>	0	10
 27	28	perception	0	0
-28	25	import	44	0
+28	25	import	43	0
 28	100
-24	28	<joker>	44	100
-28	29	import	45	0
+24	28	<joker>	43	100
+28	29	import	44	0
 29	30	body	0	0
 29	30	<epsilon>	0	10
 30	31	functions	0	0
@@ -66,37 +66,37 @@
 31	32	formal	0	0
 31	32	<epsilon>	0	10
 32	33	force	0	0
-33	29	import	45	0
+33	29	import	44	0
 33	100
-28	33	<joker>	45	100
-33	34	import	46	0
+28	33	<joker>	44	100
+33	34	import	45	0
 34	35	body	0	0
 34	35	<epsilon>	0	10
 35	36	functions	0	0
 35	36	<epsilon>	0	10
 36	37	logics	0	0
-37	34	import	46	0
+37	34	import	45	0
 37	100
-33	37	<joker>	46	100
-37	38	import	47	0
+33	37	<joker>	45	100
+37	38	import	46	0
 38	39	body	0	0
 38	39	<epsilon>	0	10
 39	40	functions	0	0
 39	40	<epsilon>	0	10
 40	41	imagination	0	0
-41	38	import	47	0
+41	38	import	46	0
 41	100
-37	41	<joker>	47	100
-41	42	import	48	0
+37	41	<joker>	46	100
+41	42	import	47	0
 42	43	body	0	0
 42	43	<epsilon>	0	10
 43	44	functions	0	0
 43	44	<epsilon>	0	10
 44	45	effort	0	0
-45	42	import	48	0
+45	42	import	47	0
 45	100
-41	45	<joker>	48	100
-45	46	import	49	0
+41	45	<joker>	47	100
+45	46	import	48	0
 46	47	body	0	0
 46	47	<epsilon>	0	10
 47	48	functions	0	0
@@ -104,10 +104,10 @@
 48	49	nervous	0	0
 48	49	<epsilon>	0	10
 49	50	system	0	0
-50	46	import	49	0
+50	46	import	48	0
 50	100
-45	50	<joker>	49	100
-50	51	import	50	0
+45	50	<joker>	48	100
+50	51	import	49	0
 51	52	body	0	0
 51	52	<epsilon>	0	10
 52	53	functions	0	0
@@ -115,11 +115,11 @@
 53	54	internal	0	0
 53	54	<epsilon>	0	10
 54	55	network	0	0
-55	51	import	50	0
+55	51	import	49	0
 55	100
-50	55	<joker>	50	100
-55	56	<epsilon>	51	0
+50	55	<joker>	49	100
+55	56	<epsilon>	50	0
 56	100
-56	57	<epsilon>	52	0
-57	58	<epsilon>	7	0
+56	57	<epsilon>	51	0
+57	58	<epsilon>	6	0
 58

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section4_exit.txt

@@ -2,5 +2,5 @@
 1	2	return	0	0
 2	3	to	0	0
 3	4	the	0	0
-4	5	center	37	0
+4	5	center	36	0
 5

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section5.txt

-0	1	<epsilon>	52	0
-1	2	set	55	0
+0	1	<epsilon>	51	0
+1	2	set	54	0
 2	3	up	0	0
 2	3	<epsilon>	0	10
 3	4	the	0	0
 3	4	<epsilon>	0	10
 4	5	connection	0	0
-5	2	set	55	0
+5	2	set	54	0
 5	100
-1	5	<joker>	55	100
-5	6	silence	56	0
-6	6	silence	56	0
+1	5	<joker>	54	100
+5	6	silence	55	0
+6	6	silence	55	0
 6	100
-5	6	<joker>	56	100
-6	7	<epsilon>	57	0
+5	6	<joker>	55	100
+6	7	<epsilon>	56	0
 7	100
-7	8	<epsilon>	58	0
-8	9	<epsilon>	7	0
+7	8	<epsilon>	57	0
+8	9	<epsilon>	6	0
 9

asr/models/homeostasis_12mai/automate/homeostasis_12mai_section5_exit.txt

@@ -2,5 +2,5 @@
 1	2	return	0	0
 2	3	to	0	0
 3	4	the	0	0
-4	5	center	54	0
+4	5	center	53	0
 5