From 91fa195cf341da5ea8f54f4c6c404673187a41cd Mon Sep 17 00:00:00 2001 From: StaY <stephane.yang@ensea.fr> Date: Thu, 26 Oct 2023 17:47:29 +0200 Subject: [PATCH] update drone script : change gas variable parameters to mask for faster test without to recompile when changing the parameters --- Promethe_scripts/navigation/drone/drone.draw | 14 +- Promethe_scripts/navigation/drone/drone.res | Bin 20228 -> 20228 bytes .../navigation/drone/drone.script | 220 ++++++++-------- Promethe_scripts/navigation/drone/drone.symb | 239 +++++++++--------- .../navigation/drone/mask_gas.txt | 4 +- Promethe_scripts/navigation/drone/readme.md | 2 +- 6 files changed, 250 insertions(+), 229 deletions(-) diff --git a/Promethe_scripts/navigation/drone/drone.draw b/Promethe_scripts/navigation/drone/drone.draw index 24bf77c..f5f1da4 100644 --- a/Promethe_scripts/navigation/drone/drone.draw +++ b/Promethe_scripts/navigation/drone/drone.draw @@ -42,14 +42,14 @@ <style>0</style> <coude_list> <coude> - <x>1300</x> - <y>92</y> + <x>1298</x> + <y>82</y> <relatif>1</relatif> <legende>0</legende> </coude> <coude> - <x>110</x> - <y>93</y> + <x>111</x> + <y>86</y> <relatif>1</relatif> <legende>2</legende> </coude> @@ -847,4 +847,10 @@ <style>0</style> <coude_list /> </liaison> + <liaison> + <depart>arm_or_checkbox</depart> + <arrivee>94</arrivee> + <style>0</style> + <coude_list /> + </liaison> </liaison_list> diff --git a/Promethe_scripts/navigation/drone/drone.res b/Promethe_scripts/navigation/drone/drone.res index 843f157bef255ee18c96c64c1c9c49069cfc46c6..3fb81893a4711cb6bcff075545e4c6b78451017f 100644 GIT binary patch delta 1088 zcmYk)IZnes7zJQukVgU$mXJW8A!*n|BGaavGXP@85cWlyGyLKP?hz&BNWQ_G1UfpV zq~saodG7q_z2_NAetB)Yyf)leC7ti_>VCenvyzMI*W{tan5l`nOkIUcd?raZR%NnZ zlb`JAboZw^LrwLxB@O5z3z^CqI_$AMjq!e@0WB$@`{(=gNQZ;J;ujv%LvEVbkODf= zgMm~tIPZvC(2@c=(u09iv)CSU3tCb@M|v=jY7W~IZb3^5=ty6dPh(llBPGpzrqi>S zdZd<AEtE;qdeeba3wZN6x2=9csdinytY)z)3;l#LZG0UmV0sa|9<-$D;7X(c!(}W> znT{(KzJnhmy{ep>rA%AWFQHAUZl(h%-4AWAt8F36SyP99f31zQy{V$ytY_Mh9t@<} zc+>VamenS1Od2q~i>ZK?EX%IOEu{CcY`{QDnLbo$;kWSdE;={cIO(y9bJ@nFNi{(F b6jL)mN_wP$R6~@XSq3dBpo=X0(DZ%*N_=dh delta 1088 zcmYk)%}x|S6b0bSC0z*wR0as>YG&ad0a9#P-gj`{i7!yka5Gz1y(ermEIa8psEyCy zPZSh&RM1jiz|%wep4ruxb8h`4H9H;6PDkx?sb0<=zJAsmA3tbJrc27uE6-$QS-Pyw zRxYdR+^e=aT~c11g!avg;S5=ughDD9-wtVKYxO9kcY_;Q$1tg2Aq|Z07v=NylaM|v zmUArI+hzYK-M|cKVEpI@WH6C(2j`Ir7Sh0Y!C5eoau>6tf`v3NUUC*pq};<SsbC=u zjGs8$mr2<~`q@+6tV2s?q=l3*%2zCp&q5+)3p<l}Jgq3%o>pIcGWS)|ww6QP#_PU% z*T9y{U?F7(SNi5<1=HMVefoW1mv`_%T6d$nbtq)sMf=ClZe*_xiL||oP@J9JuQx*a zxoFQHorH3`Tzs0xb%@u#PX-gIPtHOi<tc7_<7EX~(!fIY<@n3XvX7KhF#Yz_`qbIw teLOxEkM#g2k#>Mf|M64~k&=3d^slEGX(HtaWm3UH8W{f#vt2&Y$$ySQlIj2e diff --git a/Promethe_scripts/navigation/drone/drone.script b/Promethe_scripts/navigation/drone/drone.script index d3fc71a..c2828a8 100644 --- a/Promethe_scripts/navigation/drone/drone.script +++ b/Promethe_scripts/navigation/drone/drone.script @@ -6,7 +6,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_frame_rate -posx = 1150 , posy = 106 +posx = 1133 , posy = 95 reverse = -2 p_posx = 24 , p_posy = 28 debug = -4 @@ -19,7 +19,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1287 , posy = 157 +posx = 1270 , posy = 146 reverse = -1 p_posx = 184 , p_posy = 28 debug = -3 @@ -32,7 +32,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 993 , posy = 106 +posx = 976 , posy = 95 reverse = -1 p_posx = 344 , p_posy = 28 debug = -3 @@ -45,7 +45,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 1181 , posy = 210 +posx = 1164 , posy = 199 reverse = 0 p_posx = 504 , p_posy = 28 debug = -4 @@ -58,7 +58,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 1241 , posy = 386 +posx = 1224 , posy = 375 reverse = -2 p_posx = 664 , p_posy = 28 debug = -4 @@ -71,7 +71,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1091 , posy = 778 +posx = 1074 , posy = 767 reverse = 0 p_posx = 824 , p_posy = 28 debug = -4 @@ -84,7 +84,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1100 , posy = 343 +posx = 1078 , posy = 329 reverse = 0 p_posx = 984 , p_posy = 28 debug = -4 @@ -97,7 +97,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 1199 , posy = 594 +posx = 1182 , posy = 583 reverse = -2 p_posx = 24 , p_posy = 196 debug = -4 @@ -110,7 +110,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 993 , posy = 878 +posx = 976 , posy = 867 reverse = 0 p_posx = 184 , p_posy = 196 debug = -4 @@ -123,7 +123,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 993 , posy = 271 +posx = 976 , posy = 260 reverse = 0 p_posx = 344 , p_posy = 196 debug = -4 @@ -136,7 +136,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 1060 , posy = 543 +posx = 1043 , posy = 532 reverse = 0 p_posx = 504 , p_posy = 196 debug = -4 @@ -149,7 +149,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 945 , posy = 170 +posx = 928 , posy = 159 reverse = 0 p_posx = 664 , p_posy = 196 debug = -4 @@ -162,7 +162,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_start -posx = 987 , posy = 40 +posx = 970 , posy = 29 reverse = 1 p_posx = 824 , p_posy = 196 debug = -4 @@ -175,7 +175,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_load_mask -posx = 873 , posy = 40 +posx = 856 , posy = 29 reverse = 1 p_posx = 984 , p_posy = 196 debug = -4 @@ -188,7 +188,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 877 , posy = 226 +posx = 860 , posy = 215 reverse = 0 p_posx = 24 , p_posy = 364 debug = -4 @@ -201,7 +201,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 738 +posx = 856 , posy = 727 reverse = 0 p_posx = 184 , p_posy = 364 debug = -4 @@ -214,7 +214,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 809 +posx = 856 , posy = 798 reverse = 0 p_posx = 344 , p_posy = 364 debug = -4 @@ -227,7 +227,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 878 +posx = 856 , posy = 867 reverse = 0 p_posx = 504 , p_posy = 364 debug = -4 @@ -240,7 +240,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 830 , posy = 291 +posx = 813 , posy = 280 reverse = 0 p_posx = 664 , p_posy = 364 debug = -4 @@ -253,7 +253,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 617 +posx = 947 , posy = 606 reverse = 0 p_posx = 824 , p_posy = 364 debug = -4 @@ -266,7 +266,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 513 +posx = 947 , posy = 502 reverse = 0 p_posx = 984 , p_posy = 364 debug = -4 @@ -279,7 +279,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 573 +posx = 947 , posy = 562 reverse = -1 p_posx = 24 , p_posy = 532 debug = -3 @@ -292,7 +292,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 907 , posy = 348 +posx = 890 , posy = 337 reverse = -2 p_posx = 184 , p_posy = 532 debug = -4 @@ -305,7 +305,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold_mask -posx = 865 , posy = 617 +posx = 848 , posy = 606 reverse = 0 p_posx = 344 , p_posy = 532 debug = -4 @@ -318,7 +318,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mask -posx = 865 , posy = 573 +posx = 848 , posy = 562 reverse = 0 p_posx = 504 , p_posy = 532 debug = -4 @@ -331,7 +331,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mask -posx = 865 , posy = 513 +posx = 848 , posy = 502 reverse = 0 p_posx = 664 , p_posy = 532 debug = -4 @@ -344,7 +344,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 690 , posy = 225 +posx = 673 , posy = 214 reverse = 0 p_posx = 824 , p_posy = 532 debug = -4 @@ -357,7 +357,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 730 , posy = 673 +posx = 725 , posy = 654 reverse = -2 p_posx = 984 , p_posy = 532 debug = -4 @@ -371,7 +371,7 @@ alpha = 0.000000 simulation speed = 1.000000 type2 = 0 groupe = ??? -posx = 624 , posy = 809 +posx = 607 , posy = 798 reverse = 0 p_posx = 24 , p_posy = 700 debug = -4 @@ -385,7 +385,7 @@ alpha = 0.000000 simulation speed = 1.000000 type2 = 0 groupe = ??? -posx = 624 , posy = 738 +posx = 607 , posy = 727 reverse = 0 p_posx = 184 , p_posy = 700 debug = -4 @@ -398,7 +398,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 584 , posy = 172 +posx = 567 , posy = 161 reverse = -1 p_posx = 344 , p_posy = 700 debug = -3 @@ -411,7 +411,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 567 , posy = 291 +posx = 550 , posy = 280 reverse = 0 p_posx = 504 , p_posy = 700 debug = -4 @@ -424,7 +424,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 742 , posy = 580 +posx = 725 , posy = 569 reverse = -1 p_posx = 664 , p_posy = 700 debug = -3 @@ -437,7 +437,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 567 , posy = 849 +posx = 550 , posy = 838 reverse = 0 p_posx = 824 , p_posy = 700 debug = -4 @@ -450,7 +450,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 567 , posy = 698 +posx = 550 , posy = 687 reverse = 0 p_posx = 984 , p_posy = 700 debug = -4 @@ -463,7 +463,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 524 , posy = 40 +posx = 507 , posy = 29 reverse = 0 p_posx = 24 , p_posy = 868 debug = -4 @@ -476,7 +476,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 515 , posy = 357 +posx = 501 , posy = 348 reverse = -2 p_posx = 184 , p_posy = 868 debug = -4 @@ -489,7 +489,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 734 , posy = 484 +posx = 717 , posy = 473 reverse = -2 p_posx = 344 , p_posy = 868 debug = -4 @@ -502,7 +502,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 428 , posy = 357 +posx = 411 , posy = 346 reverse = -2 p_posx = 504 , p_posy = 868 debug = -4 @@ -515,7 +515,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 514 , posy = 231 +posx = 503 , posy = 217 reverse = -2 p_posx = 664 , p_posy = 868 debug = -3 @@ -528,7 +528,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 374 , posy = 376 +posx = 357 , posy = 365 reverse = -2 p_posx = 824 , p_posy = 868 debug = -3 @@ -541,7 +541,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 305 , posy = 408 +posx = 288 , posy = 397 reverse = -1 p_posx = 984 , p_posy = 868 debug = -3 @@ -554,7 +554,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 828 , posy = 401 +posx = 811 , posy = 390 reverse = -2 p_posx = 24 , p_posy = 1036 debug = -4 @@ -567,7 +567,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = OR -posx = 396 , posy = 992 +posx = 379 , posy = 981 reverse = -2 p_posx = 184 , p_posy = 1036 debug = -4 @@ -580,7 +580,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_vue_metres -posx = 390 , posy = 260 +posx = 373 , posy = 249 reverse = 0 p_posx = 344 , p_posy = 1036 debug = -4 @@ -593,7 +593,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 368 , posy = 322 +posx = 351 , posy = 311 reverse = 0 p_posx = 504 , p_posy = 1036 debug = -4 @@ -606,7 +606,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 206 , posy = 470 +posx = 189 , posy = 459 reverse = -1 p_posx = 664 , p_posy = 1036 debug = -3 @@ -619,7 +619,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 373 , posy = 685 +posx = 356 , posy = 674 reverse = 0 p_posx = 824 , p_posy = 1036 debug = -4 @@ -632,7 +632,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 264 , posy = 372 +posx = 247 , posy = 361 reverse = -1 p_posx = 984 , p_posy = 1036 debug = -3 @@ -645,7 +645,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 308 , posy = 1018 +posx = 291 , posy = 1007 reverse = -2 p_posx = 24 , p_posy = 1204 debug = -4 @@ -658,7 +658,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 968 +posx = 291 , posy = 957 reverse = -2 p_posx = 184 , p_posy = 1204 debug = -4 @@ -671,7 +671,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_buttons_to_neurons -posx = 308 , posy = 878 +posx = 291 , posy = 867 reverse = -1 p_posx = 344 , p_posy = 1204 debug = -3 @@ -684,7 +684,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_axe_to_single_neuron -posx = 313 , posy = 773 +posx = 296 , posy = 762 reverse = 0 p_posx = 504 , p_posy = 1204 debug = -4 @@ -697,7 +697,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_axe_to_single_neuron -posx = 308 , posy = 172 +posx = 291 , posy = 161 reverse = -1 p_posx = 664 , p_posy = 1204 debug = -3 @@ -710,7 +710,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 60 , posy = 685 +posx = 43 , posy = 674 reverse = 0 p_posx = 824 , p_posy = 1204 debug = -4 @@ -723,7 +723,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mon_token -posx = 158 , posy = 342 +posx = 141 , posy = 331 reverse = 0 p_posx = 984 , p_posy = 1204 debug = -4 @@ -736,7 +736,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_debut -posx = 63 , posy = 342 +posx = 46 , posy = 331 reverse = 0 p_posx = 24 , p_posy = 1372 debug = -4 @@ -749,7 +749,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_clock -posx = 151 , posy = 282 +posx = 134 , posy = 271 reverse = 1 p_posx = 184 , p_posy = 1372 debug = -4 @@ -762,7 +762,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick -posx = 248 , posy = 282 +posx = 231 , posy = 271 reverse = 0 p_posx = 344 , p_posy = 1372 debug = -4 @@ -775,7 +775,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 1097 +posx = 291 , posy = 1086 reverse = 0 p_posx = 504 , p_posy = 1372 debug = -4 @@ -788,7 +788,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 1156 +posx = 291 , posy = 1145 reverse = 0 p_posx = 664 , p_posy = 1372 debug = -4 @@ -801,7 +801,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 306 , posy = 1214 +posx = 289 , posy = 1203 reverse = 0 p_posx = 824 , p_posy = 1372 debug = -4 @@ -814,7 +814,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 619 , posy = 1099 +posx = 602 , posy = 1088 reverse = -2 p_posx = 984 , p_posy = 1372 debug = -4 @@ -827,7 +827,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 303 , posy = 1361 +posx = 286 , posy = 1350 reverse = 0 p_posx = 24 , p_posy = 1540 debug = -4 @@ -840,7 +840,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 619 , posy = 1159 +posx = 602 , posy = 1148 reverse = -2 p_posx = 184 , p_posy = 1540 debug = -4 @@ -853,7 +853,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 623 , posy = 1221 +posx = 606 , posy = 1210 reverse = -2 p_posx = 344 , p_posy = 1540 debug = -4 @@ -866,7 +866,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_save_images_to_disk -posx = 635 , posy = 1362 +posx = 618 , posy = 1351 reverse = -2 p_posx = 504 , p_posy = 1540 debug = -3 @@ -879,7 +879,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 612 , posy = 994 +posx = 595 , posy = 983 reverse = -2 p_posx = 664 , p_posy = 1540 debug = -4 @@ -892,7 +892,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 306 , posy = 1285 +posx = 289 , posy = 1274 reverse = 0 p_posx = 824 , p_posy = 1540 debug = -4 @@ -905,7 +905,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 621 , posy = 1286 +posx = 604 , posy = 1275 reverse = -2 p_posx = 984 , p_posy = 1540 debug = -4 @@ -918,7 +918,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 749 , posy = 291 +posx = 732 , posy = 280 reverse = 0 p_posx = 24 , p_posy = 1708 debug = -4 @@ -931,7 +931,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_modulo -posx = 647 , posy = 290 +posx = 630 , posy = 279 reverse = 0 p_posx = 184 , p_posy = 1708 debug = -4 @@ -944,7 +944,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 654 , posy = 349 +posx = 637 , posy = 338 reverse = 1 p_posx = 344 , p_posy = 1708 debug = -4 @@ -957,7 +957,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 449 , posy = 228 +posx = 432 , posy = 217 reverse = -114 p_posx = 504 , p_posy = 1708 debug = -4 @@ -970,7 +970,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 595 , posy = 443 +posx = 578 , posy = 432 reverse = -2 p_posx = 664 , p_posy = 1708 debug = -3 @@ -983,7 +983,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 410 , posy = 446 +posx = 393 , posy = 435 reverse = -1 p_posx = 824 , p_posy = 1708 debug = -3 @@ -996,7 +996,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 734 , posy = 442 +posx = 717 , posy = 431 reverse = -2 p_posx = 984 , p_posy = 1708 debug = -4 @@ -1009,7 +1009,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 159 , posy = 519 +posx = 142 , posy = 508 reverse = -1 p_posx = 24 , p_posy = 1876 debug = -3 @@ -1022,7 +1022,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 527 , posy = 574 +posx = 510 , posy = 563 reverse = -1 p_posx = 184 , p_posy = 1876 debug = -3 @@ -1035,7 +1035,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = front+ -posx = 266 , posy = 563 +posx = 249 , posy = 552 reverse = -1 p_posx = 344 , p_posy = 1876 debug = -3 @@ -1048,7 +1048,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_z-1 -posx = 241 , posy = 508 +posx = 224 , posy = 497 reverse = -1 p_posx = 504 , p_posy = 1876 debug = -3 @@ -1061,7 +1061,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 464 , posy = 491 +posx = 447 , posy = 480 reverse = -1 p_posx = 664 , p_posy = 1876 debug = -3 @@ -1074,7 +1074,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_z-1 -posx = 345 , posy = 490 +posx = 328 , posy = 479 reverse = -1 p_posx = 824 , p_posy = 1876 debug = -3 @@ -1087,7 +1087,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 743 , posy = 397 +posx = 726 , posy = 386 reverse = -2 p_posx = 984 , p_posy = 1876 debug = -4 @@ -1100,7 +1100,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 454 , posy = 704 +posx = 437 , posy = 693 reverse = -1 p_posx = 24 , p_posy = 2044 debug = -3 @@ -1113,7 +1113,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 629 , posy = 576 +posx = 612 , posy = 565 reverse = -1 p_posx = 184 , p_posy = 2044 debug = -3 @@ -1126,7 +1126,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 644 , posy = 405 +posx = 627 , posy = 394 reverse = -1 p_posx = 344 , p_posy = 2044 debug = -3 @@ -1139,7 +1139,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 68 , posy = 622 +posx = 51 , posy = 611 reverse = -1 p_posx = 504 , p_posy = 2044 debug = -3 @@ -1152,7 +1152,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 348 , posy = 571 +posx = 331 , posy = 560 reverse = -1 p_posx = 664 , p_posy = 2044 debug = -3 @@ -1165,7 +1165,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 448 , posy = 575 +posx = 431 , posy = 564 reverse = -1 p_posx = 824 , p_posy = 2044 debug = -3 @@ -1178,7 +1178,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 217 , posy = 136 +posx = 200 , posy = 125 reverse = -121 p_posx = 984 , p_posy = 2044 debug = -3 @@ -1191,7 +1191,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 1060 , posy = 136 +posx = 1043 , posy = 125 reverse = -1 p_posx = 24 , p_posy = 2212 debug = -3 @@ -1204,7 +1204,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 722 , posy = 105 +posx = 705 , posy = 94 reverse = -128 p_posx = 184 , p_posy = 2212 debug = -4 @@ -1217,7 +1217,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 398 , posy = 926 +posx = 381 , posy = 915 reverse = -135 p_posx = 344 , p_posy = 2212 debug = -4 @@ -1230,7 +1230,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_one_pulse -posx = 159 , posy = 583 +posx = 142 , posy = 572 reverse = -1 p_posx = 504 , p_posy = 2212 debug = -3 @@ -1243,10 +1243,10 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_load_mask -posx = 1075 , posy = 705 +posx = 1058 , posy = 694 reverse = 1 p_posx = 664 , p_posy = 2212 -debug = -4 +debug = -3 ech_temps = 1 %Les commentaires doivent etre mis ici. @@ -1256,7 +1256,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_start -posx = 1133 , posy = 689 +posx = 1116 , posy = 678 reverse = 1 p_posx = 824 , p_posy = 2212 debug = -4 @@ -1269,11 +1269,11 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 1025 , posy = 645 +posx = 1008 , posy = 634 reverse = 1 p_posx = 984 , p_posy = 2212 debug = -3 -ech_temps = 0 +ech_temps = 1 %Les commentaires doivent etre mis ici. groupe = gas_lower , type = 14 , nbre neurones = 1 , seuil = 0.000000 @@ -1282,11 +1282,11 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 959 , posy = 747 +posx = 942 , posy = 736 reverse = 170 p_posx = 24 , p_posy = 2380 debug = -3 -ech_temps = 0 +ech_temps = 1 %Les commentaires doivent etre mis ici. groupe = gas_mid , type = 14 , nbre neurones = 1 , seuil = 0.000000 @@ -1295,13 +1295,13 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 992 , posy = 694 +posx = 975 , posy = 683 reverse = 177 p_posx = 184 , p_posy = 2380 debug = -3 -ech_temps = 0 +ech_temps = 1 -nombre de liaisons = 139 +nombre de liaisons = 140 %Les commentaires doivent etre mis ici. liaison entre v_motors et 30 , type = 5 , nbre = 1 , norme = 0.100000 temps de memorisation entree= 0.000000 @@ -1505,7 +1505,7 @@ liaison entre 8 et 12 , type = 5 , nbre = 1 , norme = 0.100000 temps de memorisation sortie= 0.000000 mode de calcul = 0 secondaire = 0 - nom = -t10000 + nom = -t20000 proba = 1.000000 %Les commentaires doivent etre mis ici. liaison entre 12 et altitude , type = 5 , nbre = 1 , norme = 0.100000 @@ -2347,3 +2347,11 @@ liaison entre gas_lower et gas_lower2 , type = 3 , nbre = 1 , norme = 1.000000 mode de calcul = 0 secondaire = 0 proba = 1.000000 +%Les commentaires doivent etre mis ici. +liaison entre arm_or_checkbox et 94 , type = 5 , nbre = 1 , norme = 0.100000 + temps de memorisation entree= 0.000000 + temps de memorisation sortie= 0.000000 + mode de calcul = 0 + secondaire = 0 + nom = save + proba = 1.000000 diff --git a/Promethe_scripts/navigation/drone/drone.symb b/Promethe_scripts/navigation/drone/drone.symb index b03d3e7..29a441d 100644 --- a/Promethe_scripts/navigation/drone/drone.symb +++ b/Promethe_scripts/navigation/drone/drone.symb @@ -6,7 +6,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_frame_rate -posx = 1150 , posy = 106 +posx = 1133 , posy = 95 reverse = -2 p_posx = 24 , p_posy = 28 debug = -4 @@ -19,7 +19,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1287 , posy = 157 +posx = 1270 , posy = 146 reverse = -1 p_posx = 184 , p_posy = 28 debug = -3 @@ -32,7 +32,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 993 , posy = 106 +posx = 976 , posy = 95 reverse = -1 p_posx = 344 , p_posy = 28 debug = -3 @@ -45,7 +45,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 1181 , posy = 210 +posx = 1164 , posy = 199 reverse = 0 p_posx = 504 , p_posy = 28 debug = -4 @@ -58,7 +58,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 1241 , posy = 386 +posx = 1224 , posy = 375 reverse = -2 p_posx = 664 , p_posy = 28 debug = -4 @@ -71,7 +71,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1091 , posy = 778 +posx = 1074 , posy = 767 reverse = 0 p_posx = 824 , p_posy = 28 debug = -4 @@ -84,7 +84,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 1100 , posy = 343 +posx = 1078 , posy = 329 reverse = 0 p_posx = 984 , p_posy = 28 debug = -4 @@ -97,7 +97,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 1199 , posy = 594 +posx = 1182 , posy = 583 reverse = -2 p_posx = 24 , p_posy = 196 debug = -4 @@ -110,7 +110,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 993 , posy = 878 +posx = 976 , posy = 867 reverse = 0 p_posx = 184 , p_posy = 196 debug = -4 @@ -123,7 +123,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 993 , posy = 271 +posx = 976 , posy = 260 reverse = 0 p_posx = 344 , p_posy = 196 debug = -4 @@ -136,7 +136,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 1060 , posy = 543 +posx = 1043 , posy = 532 reverse = 0 p_posx = 504 , p_posy = 196 debug = -4 @@ -149,7 +149,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 945 , posy = 170 +posx = 928 , posy = 159 reverse = 0 p_posx = 664 , p_posy = 196 debug = -4 @@ -162,7 +162,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_start -posx = 987 , posy = 40 +posx = 970 , posy = 29 reverse = 1 p_posx = 824 , p_posy = 196 debug = -4 @@ -175,7 +175,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_load_mask -posx = 873 , posy = 40 +posx = 856 , posy = 29 reverse = 1 p_posx = 984 , p_posy = 196 debug = -4 @@ -188,7 +188,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 877 , posy = 226 +posx = 860 , posy = 215 reverse = 0 p_posx = 24 , p_posy = 364 debug = -4 @@ -201,7 +201,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 738 +posx = 856 , posy = 727 reverse = 0 p_posx = 184 , p_posy = 364 debug = -4 @@ -214,7 +214,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 809 +posx = 856 , posy = 798 reverse = 0 p_posx = 344 , p_posy = 364 debug = -4 @@ -227,7 +227,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold -posx = 873 , posy = 878 +posx = 856 , posy = 867 reverse = 0 p_posx = 504 , p_posy = 364 debug = -4 @@ -240,7 +240,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 830 , posy = 291 +posx = 813 , posy = 280 reverse = 0 p_posx = 664 , p_posy = 364 debug = -4 @@ -253,7 +253,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 617 +posx = 947 , posy = 606 reverse = 0 p_posx = 824 , p_posy = 364 debug = -4 @@ -266,7 +266,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 513 +posx = 947 , posy = 502 reverse = 0 p_posx = 984 , p_posy = 364 debug = -4 @@ -279,10 +279,10 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 964 , posy = 573 +posx = 947 , posy = 562 reverse = -1 p_posx = 24 , p_posy = 532 -debug = 1 +debug = -3 ech_temps = 0 %Les commentaires doivent etre mis ici. @@ -292,7 +292,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 907 , posy = 348 +posx = 890 , posy = 337 reverse = -2 p_posx = 184 , p_posy = 532 debug = -4 @@ -305,7 +305,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = threshold_mask -posx = 865 , posy = 617 +posx = 848 , posy = 606 reverse = 0 p_posx = 344 , p_posy = 532 debug = -4 @@ -318,7 +318,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mask -posx = 865 , posy = 573 +posx = 848 , posy = 562 reverse = 0 p_posx = 504 , p_posy = 532 debug = -4 @@ -331,7 +331,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mask -posx = 865 , posy = 513 +posx = 848 , posy = 502 reverse = 0 p_posx = 664 , p_posy = 532 debug = -4 @@ -344,7 +344,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 690 , posy = 225 +posx = 673 , posy = 214 reverse = 0 p_posx = 824 , p_posy = 532 debug = -4 @@ -357,7 +357,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 730 , posy = 673 +posx = 725 , posy = 654 reverse = -2 p_posx = 984 , p_posy = 532 debug = -4 @@ -371,7 +371,7 @@ alpha = 0.000000 simulation speed = 1.000000 type2 = 0 groupe = ??? -posx = 624 , posy = 809 +posx = 607 , posy = 798 reverse = 0 p_posx = 24 , p_posy = 700 debug = -4 @@ -385,7 +385,7 @@ alpha = 0.000000 simulation speed = 1.000000 type2 = 0 groupe = ??? -posx = 624 , posy = 738 +posx = 607 , posy = 727 reverse = 0 p_posx = 184 , p_posy = 700 debug = -4 @@ -398,7 +398,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 584 , posy = 172 +posx = 567 , posy = 161 reverse = -1 p_posx = 344 , p_posy = 700 debug = -3 @@ -411,7 +411,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 567 , posy = 291 +posx = 550 , posy = 280 reverse = 0 p_posx = 504 , p_posy = 700 debug = -4 @@ -424,7 +424,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 742 , posy = 580 +posx = 725 , posy = 569 reverse = -1 p_posx = 664 , p_posy = 700 debug = -3 @@ -437,7 +437,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 567 , posy = 849 +posx = 550 , posy = 838 reverse = 0 p_posx = 824 , p_posy = 700 debug = -4 @@ -450,7 +450,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 567 , posy = 698 +posx = 550 , posy = 687 reverse = 0 p_posx = 984 , p_posy = 700 debug = -4 @@ -463,7 +463,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 524 , posy = 40 +posx = 507 , posy = 29 reverse = 0 p_posx = 24 , p_posy = 868 debug = -4 @@ -476,7 +476,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 515 , posy = 357 +posx = 501 , posy = 348 reverse = -2 p_posx = 184 , p_posy = 868 debug = -4 @@ -489,7 +489,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 734 , posy = 484 +posx = 717 , posy = 473 reverse = -2 p_posx = 344 , p_posy = 868 debug = -4 @@ -502,7 +502,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 428 , posy = 357 +posx = 411 , posy = 346 reverse = -2 p_posx = 504 , p_posy = 868 debug = -4 @@ -515,7 +515,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 514 , posy = 231 +posx = 503 , posy = 217 reverse = -2 p_posx = 664 , p_posy = 868 debug = -3 @@ -528,7 +528,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 374 , posy = 376 +posx = 357 , posy = 365 reverse = -2 p_posx = 824 , p_posy = 868 debug = -3 @@ -541,7 +541,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 305 , posy = 408 +posx = 288 , posy = 397 reverse = -1 p_posx = 984 , p_posy = 868 debug = -3 @@ -554,7 +554,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 828 , posy = 401 +posx = 811 , posy = 390 reverse = -2 p_posx = 24 , p_posy = 1036 debug = -4 @@ -567,7 +567,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = OR -posx = 396 , posy = 992 +posx = 379 , posy = 981 reverse = -2 p_posx = 184 , p_posy = 1036 debug = -4 @@ -580,7 +580,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_vue_metres -posx = 390 , posy = 260 +posx = 373 , posy = 249 reverse = 0 p_posx = 344 , p_posy = 1036 debug = -4 @@ -593,7 +593,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 368 , posy = 322 +posx = 351 , posy = 311 reverse = 0 p_posx = 504 , p_posy = 1036 debug = -4 @@ -606,7 +606,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 206 , posy = 470 +posx = 189 , posy = 459 reverse = -1 p_posx = 664 , p_posy = 1036 debug = -3 @@ -619,7 +619,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 373 , posy = 685 +posx = 356 , posy = 674 reverse = 0 p_posx = 824 , p_posy = 1036 debug = -4 @@ -632,7 +632,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 264 , posy = 372 +posx = 247 , posy = 361 reverse = -1 p_posx = 984 , p_posy = 1036 debug = -3 @@ -645,7 +645,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 308 , posy = 1018 +posx = 291 , posy = 1007 reverse = -2 p_posx = 24 , p_posy = 1204 debug = -4 @@ -658,7 +658,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 968 +posx = 291 , posy = 957 reverse = -2 p_posx = 184 , p_posy = 1204 debug = -4 @@ -671,7 +671,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_buttons_to_neurons -posx = 308 , posy = 878 +posx = 291 , posy = 867 reverse = -1 p_posx = 344 , p_posy = 1204 debug = -3 @@ -684,7 +684,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_axe_to_single_neuron -posx = 313 , posy = 773 +posx = 296 , posy = 762 reverse = 0 p_posx = 504 , p_posy = 1204 debug = -4 @@ -697,7 +697,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick_axe_to_single_neuron -posx = 308 , posy = 172 +posx = 291 , posy = 161 reverse = -1 p_posx = 664 , p_posy = 1204 debug = -3 @@ -710,7 +710,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 60 , posy = 685 +posx = 43 , posy = 674 reverse = 0 p_posx = 824 , p_posy = 1204 debug = -4 @@ -723,7 +723,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = mon_token -posx = 158 , posy = 342 +posx = 141 , posy = 331 reverse = 0 p_posx = 984 , p_posy = 1204 debug = -4 @@ -736,7 +736,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_debut -posx = 63 , posy = 342 +posx = 46 , posy = 331 reverse = 0 p_posx = 24 , p_posy = 1372 debug = -4 @@ -749,7 +749,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_clock -posx = 151 , posy = 282 +posx = 134 , posy = 271 reverse = 1 p_posx = 184 , p_posy = 1372 debug = -4 @@ -762,7 +762,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_joystick -posx = 248 , posy = 282 +posx = 231 , posy = 271 reverse = 0 p_posx = 344 , p_posy = 1372 debug = -4 @@ -775,7 +775,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 1097 +posx = 291 , posy = 1086 reverse = 0 p_posx = 504 , p_posy = 1372 debug = -4 @@ -788,7 +788,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 308 , posy = 1156 +posx = 291 , posy = 1145 reverse = 0 p_posx = 664 , p_posy = 1372 debug = -4 @@ -801,7 +801,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 306 , posy = 1214 +posx = 289 , posy = 1203 reverse = 0 p_posx = 824 , p_posy = 1372 debug = -4 @@ -814,7 +814,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 619 , posy = 1099 +posx = 602 , posy = 1088 reverse = -2 p_posx = 984 , p_posy = 1372 debug = -4 @@ -827,7 +827,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 303 , posy = 1361 +posx = 286 , posy = 1350 reverse = 0 p_posx = 24 , p_posy = 1540 debug = -4 @@ -840,7 +840,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 619 , posy = 1159 +posx = 602 , posy = 1148 reverse = -2 p_posx = 184 , p_posy = 1540 debug = -4 @@ -853,7 +853,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 623 , posy = 1221 +posx = 606 , posy = 1210 reverse = -2 p_posx = 344 , p_posy = 1540 debug = -4 @@ -866,7 +866,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_save_images_to_disk -posx = 635 , posy = 1362 +posx = 618 , posy = 1351 reverse = -2 p_posx = 504 , p_posy = 1540 debug = -3 @@ -879,7 +879,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 612 , posy = 994 +posx = 595 , posy = 983 reverse = -2 p_posx = 664 , p_posy = 1540 debug = -4 @@ -892,7 +892,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_in -posx = 306 , posy = 1285 +posx = 289 , posy = 1274 reverse = 0 p_posx = 824 , p_posy = 1540 debug = -4 @@ -905,7 +905,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 621 , posy = 1286 +posx = 604 , posy = 1275 reverse = -2 p_posx = 984 , p_posy = 1540 debug = -4 @@ -918,7 +918,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 749 , posy = 291 +posx = 732 , posy = 280 reverse = 0 p_posx = 24 , p_posy = 1708 debug = -4 @@ -931,7 +931,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_modulo -posx = 647 , posy = 290 +posx = 630 , posy = 279 reverse = 0 p_posx = 184 , p_posy = 1708 debug = -4 @@ -944,7 +944,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 654 , posy = 349 +posx = 637 , posy = 338 reverse = 1 p_posx = 344 , p_posy = 1708 debug = -4 @@ -957,7 +957,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 449 , posy = 228 +posx = 432 , posy = 217 reverse = -114 p_posx = 504 , p_posy = 1708 debug = -4 @@ -970,7 +970,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 595 , posy = 443 +posx = 578 , posy = 432 reverse = -2 p_posx = 664 , p_posy = 1708 debug = -3 @@ -983,7 +983,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 410 , posy = 446 +posx = 393 , posy = 435 reverse = -1 p_posx = 824 , p_posy = 1708 debug = -3 @@ -996,7 +996,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 734 , posy = 442 +posx = 717 , posy = 431 reverse = -2 p_posx = 984 , p_posy = 1708 debug = -4 @@ -1009,7 +1009,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 159 , posy = 519 +posx = 142 , posy = 508 reverse = -1 p_posx = 24 , p_posy = 1876 debug = -3 @@ -1022,7 +1022,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 527 , posy = 574 +posx = 510 , posy = 563 reverse = -1 p_posx = 184 , p_posy = 1876 debug = -3 @@ -1035,7 +1035,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = front+ -posx = 266 , posy = 563 +posx = 249 , posy = 552 reverse = -1 p_posx = 344 , p_posy = 1876 debug = -3 @@ -1048,7 +1048,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_z-1 -posx = 241 , posy = 508 +posx = 224 , posy = 497 reverse = -1 p_posx = 504 , p_posy = 1876 debug = -3 @@ -1061,7 +1061,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 464 , posy = 491 +posx = 447 , posy = 480 reverse = -1 p_posx = 664 , p_posy = 1876 debug = -3 @@ -1074,7 +1074,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_z-1 -posx = 345 , posy = 490 +posx = 328 , posy = 479 reverse = -1 p_posx = 824 , p_posy = 1876 debug = -3 @@ -1087,7 +1087,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_concatenation -posx = 743 , posy = 397 +posx = 726 , posy = 386 reverse = -2 p_posx = 984 , p_posy = 1876 debug = -4 @@ -1100,7 +1100,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_display_image_activity -posx = 454 , posy = 704 +posx = 437 , posy = 693 reverse = -1 p_posx = 24 , p_posy = 2044 debug = -3 @@ -1113,7 +1113,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 629 , posy = 576 +posx = 612 , posy = 565 reverse = -1 p_posx = 184 , p_posy = 2044 debug = -3 @@ -1126,7 +1126,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 644 , posy = 405 +posx = 627 , posy = 394 reverse = -1 p_posx = 344 , p_posy = 2044 debug = -3 @@ -1139,7 +1139,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_bias -posx = 68 , posy = 622 +posx = 51 , posy = 611 reverse = -1 p_posx = 504 , p_posy = 2044 debug = -3 @@ -1152,7 +1152,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_sum_no_seuil -posx = 348 , posy = 571 +posx = 331 , posy = 560 reverse = -1 p_posx = 664 , p_posy = 2044 debug = -3 @@ -1165,7 +1165,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 448 , posy = 575 +posx = 431 , posy = 564 reverse = -1 p_posx = 824 , p_posy = 2044 debug = -3 @@ -1178,7 +1178,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_checkbox -posx = 217 , posy = 136 +posx = 200 , posy = 125 reverse = -121 p_posx = 984 , p_posy = 2044 debug = -3 @@ -1191,7 +1191,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_multiply -posx = 1060 , posy = 136 +posx = 1043 , posy = 125 reverse = -1 p_posx = 24 , p_posy = 2212 debug = -3 @@ -1204,7 +1204,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 722 , posy = 105 +posx = 705 , posy = 94 reverse = -128 p_posx = 184 , p_posy = 2212 debug = -4 @@ -1217,7 +1217,7 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_out -posx = 398 , posy = 926 +posx = 381 , posy = 915 reverse = -135 p_posx = 344 , p_posy = 2212 debug = -4 @@ -1230,24 +1230,23 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_one_pulse -posx = 159 , posy = 583 +posx = 142 , posy = 572 reverse = -1 p_posx = 504 , p_posy = 2212 -debug = 1 +debug = -3 ech_temps = 0 %1: gas_high, 2: gas_mid, 3: gas_low - groupe = three_gas , type = 14 , nbre neurones = 1 , seuil = 0.000000 taillex = 1 , tailley = 3 learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_load_mask -posx = 1075 , posy = 705 +posx = 1058 , posy = 694 reverse = 1 -p_posx = 984 , p_posy = 2212 -debug = 0 +p_posx = 664 , p_posy = 2212 +debug = -3 ech_temps = 1 %Les commentaires doivent etre mis ici. @@ -1257,10 +1256,10 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_start -posx = 1133 , posy = 689 +posx = 1116 , posy = 678 reverse = 1 -p_posx = 24 , p_posy = 2380 -debug = 0 +p_posx = 824 , p_posy = 2212 +debug = -4 ech_temps = 1 %Les commentaires doivent etre mis ici. @@ -1270,11 +1269,11 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 1025 , posy = 645 +posx = 1008 , posy = 634 reverse = 1 -p_posx = 0 , p_posy = 0 -debug = 1 -ech_temps = 0 +p_posx = 984 , p_posy = 2212 +debug = -3 +ech_temps = 1 %Les commentaires doivent etre mis ici. groupe = gas_lower , type = 14 , nbre neurones = 1 , seuil = 0.000000 @@ -1283,11 +1282,11 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 959 , posy = 747 +posx = 942 , posy = 736 reverse = 170 p_posx = 24 , p_posy = 2380 -debug = 1 -ech_temps = 0 +debug = -3 +ech_temps = 1 %Les commentaires doivent etre mis ici. groupe = gas_mid , type = 14 , nbre neurones = 1 , seuil = 0.000000 @@ -1296,13 +1295,13 @@ learning rate = 1.000000 simulation speed = 1.000000 type2 = 0 groupe = f_extract_neurons -posx = 992 , posy = 694 +posx = 975 , posy = 683 reverse = 177 p_posx = 184 , p_posy = 2380 -debug = 1 -ech_temps = 0 +debug = -3 +ech_temps = 1 -nombre de liaisons = 139 +nombre de liaisons = 140 %Les commentaires doivent etre mis ici. liaison entre v_motors et 30 , type = 5 , nbre = 1 , norme = 0.100000 temps de memorisation entree= 0.000000 @@ -1506,7 +1505,7 @@ liaison entre 8 et 12 , type = 5 , nbre = 1 , norme = 0.100000 temps de memorisation sortie= 0.000000 mode de calcul = 0 secondaire = 0 - nom = -t10000 + nom = -t20000 proba = 1.000000 %Les commentaires doivent etre mis ici. liaison entre 12 et altitude , type = 5 , nbre = 1 , norme = 0.100000 @@ -2348,3 +2347,11 @@ liaison entre gas_lower et gas_lower2 , type = 3 , nbre = 1 , norme = 1.000000 mode de calcul = 0 secondaire = 0 proba = 1.000000 +%Les commentaires doivent etre mis ici. +liaison entre arm_or_checkbox et 94 , type = 5 , nbre = 1 , norme = 0.100000 + temps de memorisation entree= 0.000000 + temps de memorisation sortie= 0.000000 + mode de calcul = 0 + secondaire = 0 + nom = save + proba = 1.000000 diff --git a/Promethe_scripts/navigation/drone/mask_gas.txt b/Promethe_scripts/navigation/drone/mask_gas.txt index 1b678cb..ce285e3 100644 --- a/Promethe_scripts/navigation/drone/mask_gas.txt +++ b/Promethe_scripts/navigation/drone/mask_gas.txt @@ -1,3 +1,3 @@ -0.80 +0.75 0.5 -0.1 +0.2 diff --git a/Promethe_scripts/navigation/drone/readme.md b/Promethe_scripts/navigation/drone/readme.md index c07ae3d..1c5494d 100644 --- a/Promethe_scripts/navigation/drone/readme.md +++ b/Promethe_scripts/navigation/drone/readme.md @@ -14,7 +14,7 @@ Mask to isolate the third axis (normally, the rotation of the joystick). ### mask_gas.txt -Files for the gas power command for each desired action. +File for the gas power command for each desired action. - 1st value: gas percentage enough to climb if desired altitude is above measured - 2nd value: gas percentage enough to stay stabilized if measured altitude is a little below desired altitude -- GitLab