Agrega heurística de generalización hecha por Daniel.

[z.facultad/75.68/celdas.git] / trunk / src / breve / robot / Celdas-2-5.tz

diff --git a/trunk/src/breve/robot/Celdas-2-5.tz b/trunk/src/breve/robot/Celdas-2-5.tz
index e59f0920b7f991c0e2d1ab39571f101c814e9574..ee56a6e23d8c810ef2fba1fc962519c86e231f0e 100644 (file)
--- a/trunk/src/breve/robot/Celdas-2-5.tz
+++ b/trunk/src/breve/robot/Celdas-2-5.tz
@@ -391,13 +391,13 @@ Link : CeldasSensor (aka CeldasSensors) {
                         posObstacle=i get-location.\r
                         \r
                                                                \r
                         posObstacle=i get-location.\r
                         \r
                                                                \r

-                       \r
+                       #!\r

                        if(dot((i get-direction),direction)==0):\r
                                des1=1.\r
                        else\r
                                des1=0.\r
                        if(dot((i get-direction),direction)==0):\r
                                des1=1.\r
                        else\r
                                des1=0.\r

+                       !#\r

 \r
 \r

-                       des1=1.\r

                        des2=0.\r
                        if(dot(direction,(1,1,1))<0):\r
                        {                        \r
                        des2=0.\r
                        if(dot(direction,(1,1,1))<0):\r
                        {                        \r


@@ -450,7 +450,7 @@ Link : CeldasSensor (aka CeldasSensors) {
 \r
                        \r
                        print "sensor: $id , des1: $des1, des2: $des2, des3: $des3".\r
 \r
                        \r
                        print "sensor: $id , des1: $des1, des2: $des2, des3: $des3".\r

-                       if ((des1) && (des2) && (des3)):\r
+                       if ((des2) && (des3)):\r

                          {                                    \r
                                draw clear.                             \r
                                #print " posObstacle: $posObstacle".                                                    \r
                          {                                    \r
                                draw clear.                             \r
                                #print " posObstacle: $posObstacle".                                                    \r