diff --git a/dmp/my_sol/drawing_gen/cliking_the_path.py b/dmp/my_sol/drawing_gen/cliking_the_path.py index d0b4e926c5fdf68bc9192f64b4bcdbd1d16197e3..815d1d8eb6d57bcba2155363dc5455b33143bcec 100644 --- a/dmp/my_sol/drawing_gen/cliking_the_path.py +++ b/dmp/my_sol/drawing_gen/cliking_the_path.py @@ -74,7 +74,7 @@ transf_body_to_board = pin.SE3(R, p) # offset in z # very close #path = path + np.array([0.0, 0.0, -0.0238]) -path = path + np.array([0.0, 0.0, -0.1038]) +path = path + np.array([0.0, 0.0, -0.0948]) #path = path + np.array([0.0, 0.2, -0.1438]) for i in range(len(path)): diff --git a/dmp/my_sol/drawing_gen/path_in_pixels.csv b/dmp/my_sol/drawing_gen/path_in_pixels.csv index 2b2f9c6b30775c93e4fc2ebcbeb5d170893eb005..5fc15288ede42225c2d8fdde77768ffaa94c151a 100644 --- a/dmp/my_sol/drawing_gen/path_in_pixels.csv +++ b/dmp/my_sol/drawing_gen/path_in_pixels.csv @@ -1,62 +1,153 @@ -0.14553,0.49903 -0.14763,0.49903 -0.14973,0.49903 -0.15183,0.49903 -0.16024,0.49903 -0.16654,0.49903 -0.17495,0.49903 -0.19176,0.49903 -0.19807,0.49903 -0.22118,0.49903 -0.22328,0.49903 -0.22749,0.49903 -0.24010,0.49903 -0.24850,0.49903 -0.25271,0.49903 -0.27372,0.49903 -0.27582,0.49903 -0.29894,0.49903 -0.30524,0.49903 -0.30945,0.49903 -0.31785,0.49903 -0.33677,0.49903 -0.34097,0.49903 -0.35568,0.49903 -0.37459,0.49903 -0.38090,0.49903 -0.41032,0.49903 -0.41662,0.49903 -0.42293,0.49903 -0.42713,0.49903 -0.45025,0.49903 -0.45655,0.49903 -0.47967,0.49903 -0.48387,0.49903 -0.49228,0.49903 -0.49648,0.49903 -0.50699,0.50202 -0.51960,0.50202 -0.54271,0.50202 -0.54902,0.50202 -0.56793,0.50202 -0.60156,0.50649 -0.60786,0.50649 -0.63518,0.50649 -0.64989,0.51097 -0.67090,0.51097 -0.71714,0.51545 -0.73185,0.51993 -0.76547,0.51993 -0.79489,0.52441 -0.80330,0.52441 -0.80960,0.52441 -0.83272,0.52739 -0.84113,0.52739 -0.84533,0.52739 -0.86634,0.52739 -0.86845,0.52739 -0.87685,0.53038 -0.88105,0.53038 -0.89577,0.53038 -0.90207,0.53038 -0.90207,0.53038 +0.27227,0.61767 +0.27375,0.61767 +0.27523,0.61767 +0.27671,0.61767 +0.27819,0.61767 +0.27967,0.61767 +0.28115,0.61767 +0.28263,0.61767 +0.28411,0.61767 +0.28411,0.61445 +0.28559,0.61445 +0.28707,0.61445 +0.28855,0.61445 +0.29003,0.61445 +0.29151,0.61445 +0.29299,0.61445 +0.29447,0.61445 +0.29595,0.61445 +0.29743,0.61445 +0.29891,0.61445 +0.30038,0.61445 +0.30186,0.61445 +0.30630,0.61445 +0.30778,0.61445 +0.30926,0.61445 +0.31222,0.61445 +0.31370,0.61123 +0.31518,0.61123 +0.32850,0.61123 +0.32998,0.61123 +0.33146,0.61123 +0.34626,0.61123 +0.35070,0.61123 +0.35218,0.60800 +0.35661,0.60800 +0.36401,0.60800 +0.36845,0.60800 +0.37289,0.60800 +0.38177,0.60156 +0.38325,0.60156 +0.39361,0.59189 +0.39805,0.59189 +0.40397,0.58867 +0.41136,0.58222 +0.41728,0.58222 +0.41876,0.57900 +0.42024,0.57900 +0.42172,0.57578 +0.42320,0.57256 +0.42468,0.57256 +0.42616,0.57256 +0.43060,0.56611 +0.43356,0.56289 +0.43948,0.55967 +0.44540,0.55322 +0.44836,0.55322 +0.45132,0.55000 +0.45428,0.55000 +0.46315,0.54355 +0.46463,0.54033 +0.46907,0.54033 +0.47795,0.53389 +0.47943,0.53066 +0.48387,0.53066 +0.49423,0.52422 +0.49571,0.51777 +0.50015,0.51777 +0.50903,0.51455 +0.51347,0.51455 +0.51495,0.51133 +0.52826,0.50166 +0.52974,0.50166 +0.53418,0.50166 +0.54454,0.49521 +0.54750,0.49521 +0.55046,0.49199 +0.55342,0.49199 +0.56378,0.48555 +0.56674,0.48555 +0.56822,0.48555 +0.58449,0.48555 +0.58597,0.48232 +0.59485,0.48232 +0.59929,0.48232 +0.60077,0.48232 +0.60225,0.48232 +0.60521,0.48232 +0.60965,0.48232 +0.61113,0.48232 +0.61557,0.48232 +0.61705,0.48232 +0.61853,0.48232 +0.62149,0.48232 +0.62297,0.48232 +0.62445,0.48232 +0.62888,0.48232 +0.63332,0.48232 +0.63480,0.48232 +0.64072,0.48232 +0.64220,0.48232 +0.64516,0.48232 +0.64664,0.48232 +0.64812,0.48232 +0.65256,0.48232 +0.65404,0.48232 +0.65848,0.48232 +0.66292,0.48232 +0.67032,0.48877 +0.67476,0.48877 +0.67624,0.48877 +0.68511,0.48877 +0.68659,0.48877 +0.68807,0.48877 +0.69251,0.48877 +0.69399,0.48877 +0.69843,0.49199 +0.69991,0.49199 +0.70139,0.49199 +0.70287,0.49199 +0.70435,0.49199 +0.70583,0.49199 +0.70731,0.49199 +0.70879,0.49199 +0.71323,0.49199 +0.71471,0.49199 +0.71915,0.49521 +0.72359,0.49521 +0.72803,0.49521 +0.73542,0.49521 +0.73690,0.49521 +0.73838,0.49521 +0.74282,0.49521 +0.74430,0.49521 +0.74874,0.49521 +0.75318,0.50166 +0.75466,0.50166 +0.75910,0.50166 +0.76058,0.50166 +0.76206,0.50166 +0.76354,0.50166 +0.76502,0.50166 +0.76650,0.50166 +0.76798,0.50166 +0.76946,0.50166 +0.77094,0.50166 +0.77242,0.50166 +0.77390,0.50166 +0.77538,0.50166 +0.77982,0.50166 +0.78130,0.50166 +0.78130,0.50488 +0.78278,0.50488 +0.78278,0.50488 diff --git a/dmp/my_sol/new_traj.csv b/dmp/my_sol/new_traj.csv index e237258e2a55eeca04e27c386bc7e1b7826d8054..8633950a7288ffd26b208e106f4462a5fd049606 100644 --- a/dmp/my_sol/new_traj.csv +++ b/dmp/my_sol/new_traj.csv @@ -1,241 +1,242 @@ -0.00000,-2.21506,-1.66639,1.51913,-1.93538,-1.22877,-0.54469 -0.04167,-2.21583,-1.66605,1.51881,-1.93518,-1.22840,-0.54540 -0.08333,-2.21834,-1.66492,1.51777,-1.93453,-1.22719,-0.54768 -0.12500,-2.22061,-1.66389,1.51680,-1.93392,-1.22609,-0.54977 -0.16667,-2.22269,-1.66295,1.51590,-1.93335,-1.22509,-0.55168 -0.20833,-2.22458,-1.66210,1.51507,-1.93282,-1.22418,-0.55342 -0.25000,-2.22634,-1.66130,1.51429,-1.93231,-1.22333,-0.55504 -0.29167,-2.22825,-1.66042,1.51343,-1.93176,-1.22241,-0.55680 -0.33333,-2.23000,-1.65962,1.51263,-1.93124,-1.22157,-0.55841 -0.37500,-2.23046,-1.65941,1.51243,-1.93110,-1.22134,-0.55884 -0.41667,-2.23328,-1.65809,1.51114,-1.93029,-1.21999,-0.56144 -0.45833,-2.23584,-1.65688,1.50995,-1.92953,-1.21876,-0.56381 -0.50000,-2.23817,-1.65578,1.50885,-1.92882,-1.21764,-0.56597 -0.54167,-2.24030,-1.65477,1.50784,-1.92815,-1.21661,-0.56795 -0.58333,-2.24223,-1.65385,1.50690,-1.92754,-1.21568,-0.56975 -0.62500,-2.24400,-1.65301,1.50603,-1.92696,-1.21483,-0.57139 -0.66667,-2.24467,-1.65269,1.50569,-1.92673,-1.21451,-0.57202 -0.70833,-2.24603,-1.65203,1.50501,-1.92628,-1.21385,-0.57329 -0.75000,-2.24780,-1.65117,1.50413,-1.92570,-1.21301,-0.57494 -0.79167,-2.24869,-1.65074,1.50367,-1.92540,-1.21258,-0.57577 -0.83333,-2.25090,-1.64965,1.50256,-1.92469,-1.21152,-0.57783 -0.87500,-2.25291,-1.64865,1.50154,-1.92402,-1.21056,-0.57971 -0.91667,-2.25473,-1.64774,1.50059,-1.92340,-1.20968,-0.58143 -0.95833,-2.25645,-1.64688,1.49969,-1.92281,-1.20886,-0.58303 -1.00000,-2.25841,-1.64589,1.49866,-1.92215,-1.20792,-0.58487 -1.04167,-2.26020,-1.64498,1.49771,-1.92153,-1.20707,-0.58655 -1.08333,-2.26153,-1.64430,1.49699,-1.92106,-1.20643,-0.58781 -1.12500,-2.26326,-1.64341,1.49605,-1.92045,-1.20561,-0.58943 -1.16667,-2.26418,-1.64293,1.49555,-1.92013,-1.20517,-0.59030 -1.20833,-2.26679,-1.64156,1.49415,-1.91927,-1.20393,-0.59274 -1.25000,-2.26915,-1.64030,1.49286,-1.91847,-1.20281,-0.59496 -1.29167,-2.27131,-1.63915,1.49167,-1.91772,-1.20179,-0.59699 -1.33333,-2.27327,-1.63809,1.49056,-1.91702,-1.20086,-0.59884 -1.37500,-2.27506,-1.63713,1.48954,-1.91637,-1.20001,-0.60053 -1.41667,-2.27669,-1.63625,1.48859,-1.91576,-1.19924,-0.60208 -1.45833,-2.27794,-1.63556,1.48786,-1.91531,-1.19864,-0.60327 -1.50000,-2.28062,-1.63407,1.48634,-1.91439,-1.19739,-0.60579 -1.54167,-2.28305,-1.63270,1.48492,-1.91354,-1.19624,-0.60808 -1.58333,-2.28527,-1.63145,1.48362,-1.91274,-1.19520,-0.61018 -1.62500,-2.28728,-1.63031,1.48241,-1.91199,-1.19426,-0.61209 -1.66667,-2.28911,-1.62927,1.48129,-1.91130,-1.19339,-0.61383 -1.70833,-2.29078,-1.62831,1.48026,-1.91065,-1.19261,-0.61542 -1.75000,-2.29144,-1.62793,1.47985,-1.91040,-1.19230,-0.61605 -1.79167,-2.29322,-1.62690,1.47874,-1.90971,-1.19146,-0.61774 -1.83333,-2.29484,-1.62595,1.47772,-1.90908,-1.19070,-0.61929 -1.87500,-2.29517,-1.62576,1.47751,-1.90895,-1.19055,-0.61960 -1.91667,-2.29683,-1.62479,1.47645,-1.90830,-1.18977,-0.62119 -1.95833,-2.29765,-1.62430,1.47593,-1.90798,-1.18939,-0.62197 -2.00000,-2.29951,-1.62319,1.47475,-1.90727,-1.18852,-0.62374 -2.04167,-2.30121,-1.62217,1.47366,-1.90661,-1.18773,-0.62536 -2.08333,-2.30255,-1.62136,1.47278,-1.90608,-1.18710,-0.62665 -2.12500,-2.30492,-1.61991,1.47127,-1.90521,-1.18600,-0.62891 -2.16667,-2.30708,-1.61858,1.46987,-1.90439,-1.18500,-0.63096 -2.20833,-2.30904,-1.61736,1.46857,-1.90363,-1.18409,-0.63284 -2.25000,-2.31083,-1.61624,1.46738,-1.90292,-1.18327,-0.63455 -2.29167,-2.31245,-1.61522,1.46627,-1.90226,-1.18251,-0.63611 -2.33333,-2.31323,-1.61473,1.46573,-1.90194,-1.18215,-0.63686 -2.37500,-2.31484,-1.61371,1.46462,-1.90128,-1.18140,-0.63841 -2.41667,-2.31567,-1.61318,1.46405,-1.90094,-1.18102,-0.63921 -2.45833,-2.31779,-1.61182,1.46261,-1.90012,-1.18005,-0.64124 -2.50000,-2.31972,-1.61056,1.46127,-1.89936,-1.17916,-0.64309 -2.54167,-2.32148,-1.60942,1.46004,-1.89864,-1.17835,-0.64478 -2.58333,-2.32308,-1.60837,1.45889,-1.89797,-1.17762,-0.64632 -2.62500,-2.32392,-1.60782,1.45829,-1.89763,-1.17723,-0.64713 -2.66667,-2.32621,-1.60629,1.45668,-1.89673,-1.17618,-0.64933 -2.70833,-2.32830,-1.60488,1.45519,-1.89589,-1.17523,-0.65134 -2.75000,-2.33020,-1.60360,1.45381,-1.89511,-1.17436,-0.65317 -2.79167,-2.33193,-1.60242,1.45253,-1.89439,-1.17357,-0.65484 -2.83333,-2.33350,-1.60135,1.45135,-1.89371,-1.17285,-0.65636 -2.87500,-2.33427,-1.60082,1.45077,-1.89338,-1.17250,-0.65710 -2.91667,-2.33593,-1.59967,1.44952,-1.89267,-1.17174,-0.65871 -2.95833,-2.33744,-1.59862,1.44836,-1.89200,-1.17105,-0.66018 -3.00000,-2.33788,-1.59832,1.44804,-1.89183,-1.17086,-0.66060 -3.04167,-2.34062,-1.59638,1.44602,-1.89075,-1.16962,-0.66324 -3.08333,-2.34311,-1.59460,1.44415,-1.88975,-1.16850,-0.66564 -3.12500,-2.34537,-1.59298,1.44241,-1.88881,-1.16748,-0.66783 -3.16667,-2.34743,-1.59149,1.44080,-1.88794,-1.16655,-0.66982 -3.20833,-2.34929,-1.59013,1.43932,-1.88712,-1.16571,-0.67164 -3.25000,-2.35099,-1.58888,1.43794,-1.88636,-1.16494,-0.67329 -3.29167,-2.35254,-1.58774,1.43667,-1.88565,-1.16424,-0.67480 -3.33333,-2.35343,-1.58708,1.43593,-1.88523,-1.16384,-0.67567 -3.37500,-2.35504,-1.58587,1.43460,-1.88450,-1.16311,-0.67725 -3.41667,-2.35652,-1.58477,1.43336,-1.88381,-1.16245,-0.67869 -3.45833,-2.35682,-1.58453,1.43311,-1.88367,-1.16231,-0.67899 -3.50000,-2.35843,-1.58332,1.43177,-1.88294,-1.16159,-0.68055 -3.54167,-2.35988,-1.58221,1.43053,-1.88225,-1.16094,-0.68198 -3.58333,-2.36018,-1.58198,1.43027,-1.88212,-1.16081,-0.68227 -3.62500,-2.36167,-1.58084,1.42900,-1.88142,-1.16014,-0.68373 -3.66667,-2.36248,-1.58021,1.42832,-1.88105,-1.15978,-0.68452 -3.70833,-2.36483,-1.57839,1.42637,-1.88005,-1.15874,-0.68680 -3.75000,-2.36696,-1.57672,1.42457,-1.87912,-1.15779,-0.68888 -3.79167,-2.36889,-1.57519,1.42291,-1.87824,-1.15693,-0.69077 -3.83333,-2.37065,-1.57379,1.42137,-1.87743,-1.15615,-0.69250 -3.87500,-2.37225,-1.57251,1.41994,-1.87667,-1.15544,-0.69407 -3.91667,-2.37371,-1.57134,1.41862,-1.87596,-1.15480,-0.69550 -3.95833,-2.37428,-1.57088,1.41810,-1.87568,-1.15454,-0.69606 -4.00000,-2.37583,-1.56961,1.41669,-1.87493,-1.15386,-0.69759 -4.04167,-2.37725,-1.56846,1.41539,-1.87423,-1.15323,-0.69898 -4.08333,-2.37762,-1.56815,1.41506,-1.87406,-1.15307,-0.69935 -4.12500,-2.37991,-1.56627,1.41303,-1.87304,-1.15206,-0.70159 -4.16667,-2.38198,-1.56454,1.41115,-1.87209,-1.15115,-0.70363 -4.20833,-2.38387,-1.56296,1.40941,-1.87119,-1.15033,-0.70548 -4.25000,-2.38558,-1.56151,1.40780,-1.87036,-1.14958,-0.70717 -4.29167,-2.38714,-1.56019,1.40631,-1.86959,-1.14889,-0.70871 -4.33333,-2.38855,-1.55897,1.40494,-1.86886,-1.14827,-0.71011 -4.37500,-2.38910,-1.55850,1.40440,-1.86858,-1.14803,-0.71065 -4.41667,-2.39052,-1.55727,1.40301,-1.86785,-1.14741,-0.71206 -4.45833,-2.39122,-1.55667,1.40232,-1.86749,-1.14710,-0.71275 -4.50000,-2.39282,-1.55528,1.40077,-1.86670,-1.14641,-0.71433 -4.54167,-2.39427,-1.55400,1.39933,-1.86595,-1.14578,-0.71577 -4.58333,-2.39535,-1.55305,1.39824,-1.86539,-1.14530,-0.71684 -4.62500,-2.39676,-1.55180,1.39683,-1.86466,-1.14469,-0.71824 -4.66667,-2.39744,-1.55116,1.39609,-1.86429,-1.14439,-0.71892 -4.70833,-2.39898,-1.54949,1.39413,-1.86339,-1.14372,-0.72044 -4.75000,-2.40038,-1.54796,1.39231,-1.86254,-1.14312,-0.72183 -4.79167,-2.40165,-1.54656,1.39063,-1.86175,-1.14256,-0.72310 -4.83333,-2.40230,-1.54585,1.38978,-1.86136,-1.14228,-0.72374 -4.87500,-2.40394,-1.54414,1.38780,-1.86043,-1.14158,-0.72537 -4.91667,-2.40542,-1.54257,1.38596,-1.85957,-1.14094,-0.72684 -4.95833,-2.40677,-1.54113,1.38426,-1.85876,-1.14035,-0.72819 -5.00000,-2.40810,-1.53973,1.38260,-1.85797,-1.13978,-0.72951 -5.04167,-2.41019,-1.53763,1.38024,-1.85687,-1.13889,-0.73157 -5.08333,-2.41208,-1.53570,1.37805,-1.85584,-1.13808,-0.73345 -5.12500,-2.41380,-1.53394,1.37602,-1.85488,-1.13735,-0.73516 -5.16667,-2.41536,-1.53233,1.37415,-1.85399,-1.13668,-0.73672 -5.20833,-2.41677,-1.53085,1.37241,-1.85315,-1.13607,-0.73813 -5.25000,-2.41806,-1.52949,1.37080,-1.85237,-1.13553,-0.73942 -5.29167,-2.41857,-1.52896,1.37017,-1.85206,-1.13531,-0.73993 -5.33333,-2.41995,-1.52751,1.36848,-1.85124,-1.13472,-0.74132 -5.37500,-2.42121,-1.52618,1.36691,-1.85048,-1.13418,-0.74258 -5.41667,-2.42153,-1.52585,1.36653,-1.85030,-1.13405,-0.74290 -5.45833,-2.42342,-1.52391,1.36433,-1.84926,-1.13324,-0.74479 -5.50000,-2.42514,-1.52213,1.36229,-1.84830,-1.13252,-0.74650 -5.54167,-2.42670,-1.52050,1.36040,-1.84740,-1.13185,-0.74807 -5.58333,-2.42812,-1.51900,1.35865,-1.84655,-1.13125,-0.74949 -5.62500,-2.42941,-1.51764,1.35704,-1.84577,-1.13071,-0.75079 -5.66667,-2.43013,-1.51682,1.35608,-1.84532,-1.13041,-0.75151 -5.70833,-2.43242,-1.51400,1.35277,-1.84390,-1.12945,-0.75379 -5.75000,-2.43448,-1.51141,1.34969,-1.84257,-1.12858,-0.75586 -5.79167,-2.43636,-1.50903,1.34684,-1.84132,-1.12780,-0.75774 -5.83333,-2.43805,-1.50685,1.34421,-1.84016,-1.12708,-0.75944 -5.87500,-2.43959,-1.50485,1.34176,-1.83907,-1.12644,-0.76099 -5.91667,-2.44099,-1.50301,1.33950,-1.83805,-1.12585,-0.76241 -5.95833,-2.44226,-1.50133,1.33741,-1.83710,-1.12532,-0.76369 -6.00000,-2.44340,-1.49979,1.33548,-1.83621,-1.12484,-0.76486 -6.04167,-2.44407,-1.49890,1.33436,-1.83570,-1.12456,-0.76553 -6.08333,-2.44530,-1.49730,1.33237,-1.83479,-1.12405,-0.76678 -6.12500,-2.44642,-1.49583,1.33054,-1.83394,-1.12358,-0.76792 -6.16667,-2.44674,-1.49543,1.33007,-1.83373,-1.12345,-0.76824 -6.20833,-2.44880,-1.49298,1.32720,-1.83245,-1.12260,-0.77031 -6.25000,-2.45067,-1.49072,1.32454,-1.83125,-1.12183,-0.77220 -6.29167,-2.45236,-1.48866,1.32207,-1.83013,-1.12113,-0.77391 -6.33333,-2.45390,-1.48676,1.31979,-1.82909,-1.12049,-0.77546 -6.37500,-2.45529,-1.48502,1.31767,-1.82811,-1.11992,-0.77688 -6.41667,-2.45655,-1.48343,1.31571,-1.82719,-1.11940,-0.77816 -6.45833,-2.45770,-1.48197,1.31390,-1.82634,-1.11892,-0.77933 -6.50000,-2.45806,-1.48146,1.31326,-1.82606,-1.11878,-0.77970 -6.54167,-2.45944,-1.47926,1.31049,-1.82488,-1.11821,-0.78111 -6.58333,-2.46069,-1.47725,1.30791,-1.82378,-1.11769,-0.78238 -6.62500,-2.46183,-1.47540,1.30553,-1.82275,-1.11722,-0.78354 -6.66667,-2.46286,-1.47371,1.30333,-1.82179,-1.11680,-0.78460 -6.70833,-2.46369,-1.47236,1.30159,-1.82102,-1.11646,-0.78545 -6.75000,-2.46535,-1.47001,1.29870,-1.81978,-1.11578,-0.78713 -6.79167,-2.46685,-1.46785,1.29603,-1.81861,-1.11517,-0.78866 -6.83333,-2.46820,-1.46588,1.29356,-1.81752,-1.11462,-0.79004 -6.87500,-2.46943,-1.46406,1.29126,-1.81650,-1.11412,-0.79130 -6.91667,-2.47055,-1.46239,1.28914,-1.81555,-1.11366,-0.79245 -6.95833,-2.47172,-1.46063,1.28690,-1.81456,-1.11319,-0.79365 -7.00000,-2.47416,-1.45696,1.28243,-1.81271,-1.11220,-0.79611 -7.04167,-2.47637,-1.45358,1.27827,-1.81098,-1.11132,-0.79835 -7.08333,-2.47836,-1.45049,1.27441,-1.80936,-1.11052,-0.80038 -7.12500,-2.48016,-1.44764,1.27083,-1.80784,-1.10979,-0.80222 -7.16667,-2.48179,-1.44502,1.26751,-1.80641,-1.10914,-0.80389 -7.20833,-2.48327,-1.44262,1.26443,-1.80508,-1.10854,-0.80541 -7.25000,-2.48461,-1.44041,1.26158,-1.80383,-1.10801,-0.80679 -7.29167,-2.48582,-1.43839,1.25893,-1.80266,-1.10752,-0.80804 -7.33333,-2.48692,-1.43653,1.25648,-1.80156,-1.10708,-0.80918 -7.37500,-2.48791,-1.43482,1.25420,-1.80054,-1.10668,-0.81021 -7.41667,-2.48868,-1.43345,1.25238,-1.79973,-1.10637,-0.81100 -7.45833,-2.48985,-1.43107,1.24919,-1.79840,-1.10590,-0.81221 -7.50000,-2.49090,-1.42888,1.24624,-1.79716,-1.10548,-0.81331 -7.54167,-2.49186,-1.42687,1.24350,-1.79599,-1.10510,-0.81430 -7.58333,-2.49273,-1.42502,1.24096,-1.79491,-1.10475,-0.81521 -7.62500,-2.49356,-1.42333,1.23866,-1.79392,-1.10442,-0.81608 -7.66667,-2.49546,-1.42024,1.23478,-1.79228,-1.10367,-0.81802 -7.70833,-2.49718,-1.41740,1.23117,-1.79075,-1.10299,-0.81979 -7.75000,-2.49874,-1.41479,1.22782,-1.78931,-1.10238,-0.82139 -7.79167,-2.50014,-1.41239,1.22471,-1.78796,-1.10182,-0.82284 -7.83333,-2.50142,-1.41018,1.22183,-1.78669,-1.10132,-0.82416 -7.87500,-2.50257,-1.40816,1.21915,-1.78551,-1.10087,-0.82536 -7.91667,-2.50361,-1.40629,1.21667,-1.78440,-1.10046,-0.82645 -7.95833,-2.50456,-1.40458,1.21436,-1.78337,-1.10009,-0.82744 -8.00000,-2.50517,-1.40345,1.21285,-1.78270,-1.09985,-0.82808 -8.04167,-2.50680,-1.40034,1.20880,-1.78102,-1.09921,-0.82975 -8.08333,-2.50827,-1.39749,1.20503,-1.77944,-1.09864,-0.83127 -8.12500,-2.50960,-1.39486,1.20153,-1.77797,-1.09812,-0.83265 -8.16667,-2.51080,-1.39244,1.19828,-1.77658,-1.09765,-0.83391 -8.20833,-2.51189,-1.39022,1.19527,-1.77528,-1.09722,-0.83504 -8.25000,-2.51288,-1.38818,1.19247,-1.77406,-1.09684,-0.83608 -8.29167,-2.51377,-1.38629,1.18987,-1.77293,-1.09649,-0.83701 -8.33333,-2.51458,-1.38456,1.18746,-1.77186,-1.09617,-0.83787 -8.37500,-2.51468,-1.38436,1.18719,-1.77174,-1.09613,-0.83798 -8.41667,-2.51569,-1.38239,1.18452,-1.77057,-1.09574,-0.83903 -8.45833,-2.51660,-1.38057,1.18204,-1.76947,-1.09539,-0.83998 -8.50000,-2.51737,-1.37903,1.17993,-1.76853,-1.09509,-0.84079 -8.54167,-2.51833,-1.37719,1.17744,-1.76743,-1.09472,-0.84180 -8.58333,-2.51920,-1.37549,1.17512,-1.76640,-1.09438,-0.84272 -8.62500,-2.51943,-1.37504,1.17452,-1.76614,-1.09429,-0.84296 -8.66667,-2.52085,-1.37225,1.17082,-1.76459,-1.09375,-0.84443 -8.70833,-2.52212,-1.36968,1.16739,-1.76314,-1.09326,-0.84575 -8.75000,-2.52328,-1.36731,1.16420,-1.76177,-1.09282,-0.84696 -8.79167,-2.52433,-1.36513,1.16123,-1.76049,-1.09241,-0.84806 -8.83333,-2.52527,-1.36313,1.15847,-1.75929,-1.09205,-0.84905 -8.87500,-2.52613,-1.36128,1.15591,-1.75817,-1.09172,-0.84996 -8.91667,-2.52678,-1.35987,1.15395,-1.75730,-1.09147,-0.85065 -8.95833,-2.52777,-1.35788,1.15124,-1.75611,-1.09109,-0.85169 -9.00000,-2.52867,-1.35604,1.14873,-1.75500,-1.09075,-0.85263 -9.04167,-2.52941,-1.35450,1.14659,-1.75405,-1.09047,-0.85342 -9.08333,-2.53029,-1.35273,1.14417,-1.75297,-1.09013,-0.85434 -9.12500,-2.53085,-1.35163,1.14267,-1.75231,-1.08992,-0.85493 -9.16667,-2.53227,-1.34907,1.13934,-1.75087,-1.08938,-0.85641 -9.20833,-2.53355,-1.34672,1.13623,-1.74952,-1.08890,-0.85775 -9.25000,-2.53471,-1.34455,1.13334,-1.74825,-1.08846,-0.85897 -9.29167,-2.53577,-1.34255,1.13065,-1.74706,-1.08806,-0.86007 -9.33333,-2.53672,-1.34071,1.12816,-1.74594,-1.08770,-0.86108 -9.37500,-2.53758,-1.33901,1.12583,-1.74489,-1.08737,-0.86199 -9.41667,-2.53775,-1.33868,1.12537,-1.74468,-1.08731,-0.86217 -9.45833,-2.53844,-1.33730,1.12348,-1.74383,-1.08705,-0.86290 -9.50000,-2.53935,-1.33519,1.12054,-1.74258,-1.08670,-0.86386 -9.54167,-2.54017,-1.33324,1.11781,-1.74139,-1.08639,-0.86473 -9.58333,-2.54092,-1.33145,1.11527,-1.74029,-1.08611,-0.86552 -9.62500,-2.54100,-1.33126,1.11501,-1.74017,-1.08608,-0.86561 -9.66667,-2.54180,-1.32941,1.11242,-1.73904,-1.08578,-0.86646 -9.70833,-2.54229,-1.32830,1.11087,-1.73836,-1.08559,-0.86698 -9.75000,-2.54343,-1.32596,1.10771,-1.73700,-1.08517,-0.86817 -9.79167,-2.54446,-1.32381,1.10476,-1.73572,-1.08478,-0.86926 -9.83333,-2.54539,-1.32182,1.10203,-1.73452,-1.08443,-0.87024 -9.87500,-2.54624,-1.31999,1.09948,-1.73339,-1.08412,-0.87114 -9.91667,-2.54680,-1.31876,1.09776,-1.73263,-1.08391,-0.87173 -9.95833,-2.54770,-1.31685,1.09514,-1.73147,-1.08357,-0.87269 -10.00000,-2.54852,-1.31510,1.09269,-1.73038,-1.08326,-0.87356 +0.00000,-2.23359,-1.51890,1.32370,-1.88167,-1.21971,-0.56229 +0.04149,-2.23442,-1.51858,1.32343,-1.88148,-1.21931,-0.56305 +0.08299,-2.23613,-1.51788,1.32283,-1.88106,-1.21849,-0.56463 +0.12448,-2.23693,-1.51755,1.32254,-1.88085,-1.21811,-0.56537 +0.16598,-2.23790,-1.51715,1.32218,-1.88060,-1.21765,-0.56625 +0.20747,-2.23870,-1.51680,1.32186,-1.88039,-1.21727,-0.56700 +0.24896,-2.24032,-1.51609,1.32119,-1.87994,-1.21649,-0.56850 +0.29046,-2.24050,-1.51604,1.32116,-1.87990,-1.21641,-0.56866 +0.33195,-2.24167,-1.51570,1.32095,-1.87967,-1.21585,-0.56974 +0.37344,-2.24256,-1.51541,1.32074,-1.87947,-1.21542,-0.57057 +0.41494,-2.24475,-1.51457,1.32003,-1.87893,-1.21438,-0.57259 +0.45643,-2.24674,-1.51381,1.31937,-1.87842,-1.21343,-0.57444 +0.49793,-2.24854,-1.51310,1.31875,-1.87794,-1.21257,-0.57612 +0.53942,-2.25019,-1.51246,1.31818,-1.87749,-1.21178,-0.57765 +0.58091,-2.25035,-1.51239,1.31812,-1.87745,-1.21171,-0.57780 +0.62241,-2.25115,-1.51207,1.31782,-1.87722,-1.21132,-0.57855 +0.66390,-2.25202,-1.51169,1.31747,-1.87697,-1.21091,-0.57936 +0.70539,-2.25422,-1.51065,1.31644,-1.87630,-1.20986,-0.58140 +0.74689,-2.25622,-1.50969,1.31548,-1.87567,-1.20891,-0.58327 +0.78838,-2.25803,-1.50881,1.31459,-1.87508,-1.20805,-0.58496 +0.82988,-2.25968,-1.50801,1.31376,-1.87453,-1.20726,-0.58651 +0.87137,-2.26047,-1.50762,1.31336,-1.87426,-1.20688,-0.58725 +0.91286,-2.26211,-1.50678,1.31248,-1.87369,-1.20610,-0.58879 +0.95436,-2.26290,-1.50641,1.31210,-1.87343,-1.20573,-0.58953 +0.99585,-2.26406,-1.50600,1.31175,-1.87312,-1.20517,-0.59062 +1.03734,-2.26578,-1.50534,1.31117,-1.87264,-1.20436,-0.59223 +1.07884,-2.26661,-1.50500,1.31087,-1.87240,-1.20396,-0.59302 +1.12033,-2.26845,-1.50421,1.31011,-1.87184,-1.20309,-0.59475 +1.16183,-2.27013,-1.50347,1.30941,-1.87132,-1.20229,-0.59633 +1.20332,-2.27093,-1.50312,1.30906,-1.87107,-1.20191,-0.59708 +1.24481,-2.27259,-1.50234,1.30828,-1.87052,-1.20113,-0.59865 +1.28631,-2.27339,-1.50196,1.30790,-1.87026,-1.20075,-0.59940 +1.32780,-2.27504,-1.50115,1.30707,-1.86969,-1.19997,-0.60096 +1.36929,-2.27602,-1.50071,1.30664,-1.86938,-1.19950,-0.60189 +1.41079,-2.27809,-1.50016,1.30633,-1.86894,-1.19853,-0.60383 +1.45228,-2.27997,-1.49965,1.30605,-1.86853,-1.19765,-0.60561 +1.49378,-2.28167,-1.49919,1.30578,-1.86815,-1.19684,-0.60723 +1.53527,-2.28201,-1.49910,1.30572,-1.86807,-1.19669,-0.60754 +1.57676,-2.28291,-1.49889,1.30564,-1.86790,-1.19626,-0.60839 +1.61826,-2.28526,-1.49877,1.30610,-1.86768,-1.19516,-0.61062 +1.65975,-2.28741,-1.49866,1.30651,-1.86747,-1.19416,-0.61264 +1.70124,-2.28936,-1.49856,1.30689,-1.86728,-1.19325,-0.61450 +1.74274,-2.29114,-1.49848,1.30723,-1.86709,-1.19241,-0.61618 +1.78423,-2.29133,-1.49845,1.30725,-1.86707,-1.19233,-0.61636 +1.82573,-2.29314,-1.49824,1.30740,-1.86682,-1.19148,-0.61808 +1.86722,-2.29402,-1.49814,1.30749,-1.86671,-1.19107,-0.61893 +1.90871,-2.29599,-1.49797,1.30779,-1.86649,-1.19015,-0.62079 +1.95021,-2.29777,-1.49783,1.30805,-1.86629,-1.18932,-0.62249 +1.99170,-2.29834,-1.49780,1.30817,-1.86624,-1.18905,-0.62303 +2.03320,-2.30050,-1.49786,1.30888,-1.86613,-1.18805,-0.62508 +2.07469,-2.30247,-1.49792,1.30952,-1.86604,-1.18714,-0.62696 +2.11618,-2.30426,-1.49797,1.31011,-1.86594,-1.18631,-0.62867 +2.15768,-2.30463,-1.49796,1.31020,-1.86592,-1.18614,-0.62902 +2.19917,-2.30650,-1.49782,1.31052,-1.86573,-1.18527,-0.63081 +2.24066,-2.30790,-1.49773,1.31079,-1.86559,-1.18462,-0.63214 +2.28216,-2.30967,-1.49778,1.31137,-1.86550,-1.18380,-0.63383 +2.32365,-2.30985,-1.49778,1.31142,-1.86549,-1.18372,-0.63400 +2.36515,-2.31072,-1.49780,1.31169,-1.86544,-1.18332,-0.63484 +2.40664,-2.31250,-1.49795,1.31245,-1.86541,-1.18250,-0.63654 +2.44813,-2.31268,-1.49799,1.31256,-1.86542,-1.18241,-0.63672 +2.48963,-2.31448,-1.49830,1.31356,-1.86547,-1.18158,-0.63843 +2.53112,-2.31482,-1.49835,1.31374,-1.86548,-1.18142,-0.63876 +2.57261,-2.31552,-1.49844,1.31408,-1.86548,-1.18110,-0.63943 +2.61411,-2.31642,-1.49856,1.31453,-1.86549,-1.18069,-0.64029 +2.65560,-2.31847,-1.49900,1.31583,-1.86561,-1.17975,-0.64225 +2.69710,-2.32033,-1.49942,1.31702,-1.86572,-1.17890,-0.64404 +2.73859,-2.32156,-1.49970,1.31782,-1.86579,-1.17833,-0.64522 +2.78008,-2.32341,-1.50017,1.31909,-1.86594,-1.17748,-0.64699 +2.82158,-2.32448,-1.50043,1.31983,-1.86602,-1.17699,-0.64802 +2.86307,-2.32647,-1.50086,1.32109,-1.86614,-1.17609,-0.64992 +2.90456,-2.32828,-1.50125,1.32225,-1.86625,-1.17526,-0.65166 +2.94606,-2.32901,-1.50142,1.32274,-1.86631,-1.17493,-0.65237 +2.98755,-2.33111,-1.50199,1.32426,-1.86650,-1.17398,-0.65438 +3.02905,-2.33302,-1.50251,1.32566,-1.86668,-1.17310,-0.65623 +3.07054,-2.33477,-1.50299,1.32695,-1.86685,-1.17231,-0.65791 +3.11203,-2.33495,-1.50303,1.32706,-1.86686,-1.17223,-0.65809 +3.15353,-2.33636,-1.50332,1.32795,-1.86694,-1.17159,-0.65944 +3.19502,-2.33820,-1.50374,1.32919,-1.86708,-1.17075,-0.66122 +3.23651,-2.33925,-1.50397,1.32987,-1.86715,-1.17028,-0.66223 +3.27801,-2.34071,-1.50421,1.33070,-1.86721,-1.16962,-0.66364 +3.31950,-2.34295,-1.50457,1.33199,-1.86732,-1.16861,-0.66580 +3.36100,-2.34499,-1.50491,1.33317,-1.86742,-1.16769,-0.66777 +3.40249,-2.34686,-1.50522,1.33426,-1.86750,-1.16685,-0.66957 +3.44398,-2.34808,-1.50544,1.33499,-1.86756,-1.16629,-0.67076 +3.48548,-2.34987,-1.50587,1.33623,-1.86770,-1.16549,-0.67249 +3.52697,-2.35039,-1.50597,1.33656,-1.86774,-1.16526,-0.67300 +3.56846,-2.35217,-1.50621,1.33750,-1.86778,-1.16446,-0.67472 +3.60996,-2.35258,-1.50626,1.33772,-1.86780,-1.16428,-0.67511 +3.65145,-2.35481,-1.50656,1.33893,-1.86788,-1.16328,-0.67727 +3.69295,-2.35684,-1.50685,1.34005,-1.86795,-1.16237,-0.67924 +3.73444,-2.35870,-1.50711,1.34107,-1.86801,-1.16154,-0.68105 +3.77593,-2.35992,-1.50730,1.34176,-1.86806,-1.16099,-0.68223 +3.81743,-2.36170,-1.50768,1.34294,-1.86818,-1.16020,-0.68396 +3.85892,-2.36205,-1.50774,1.34315,-1.86819,-1.16004,-0.68431 +3.90041,-2.36384,-1.50793,1.34404,-1.86822,-1.15925,-0.68605 +3.94191,-2.36425,-1.50797,1.34424,-1.86823,-1.15906,-0.68645 +3.98340,-2.36655,-1.50817,1.34535,-1.86826,-1.15805,-0.68868 +4.02490,-2.36864,-1.50836,1.34636,-1.86829,-1.15712,-0.69072 +4.06639,-2.37056,-1.50854,1.34729,-1.86831,-1.15627,-0.69259 +4.10788,-2.37233,-1.50875,1.34820,-1.86834,-1.15549,-0.69432 +4.14938,-2.37424,-1.50925,1.34962,-1.86852,-1.15464,-0.69619 +4.19087,-2.37598,-1.50972,1.35092,-1.86867,-1.15387,-0.69789 +4.23237,-2.37617,-1.50975,1.35102,-1.86868,-1.15379,-0.69807 +4.27386,-2.37793,-1.51001,1.35204,-1.86875,-1.15301,-0.69980 +4.31535,-2.37832,-1.51005,1.35223,-1.86875,-1.15284,-0.70018 +4.35685,-2.38041,-1.51016,1.35314,-1.86875,-1.15193,-0.70222 +4.39834,-2.38231,-1.51027,1.35397,-1.86874,-1.15109,-0.70409 +4.43983,-2.38407,-1.51036,1.35472,-1.86872,-1.15032,-0.70581 +4.48133,-2.38584,-1.51029,1.35524,-1.86862,-1.14955,-0.70755 +4.52282,-2.38636,-1.51028,1.35542,-1.86860,-1.14932,-0.70806 +4.56432,-2.38812,-1.51037,1.35618,-1.86858,-1.14855,-0.70979 +4.60581,-2.38855,-1.51040,1.35637,-1.86858,-1.14836,-0.71021 +4.64730,-2.39108,-1.51057,1.35755,-1.86860,-1.14726,-0.71269 +4.68880,-2.39339,-1.51073,1.35863,-1.86861,-1.14627,-0.71496 +4.73029,-2.39549,-1.51089,1.35962,-1.86861,-1.14535,-0.71702 +4.77178,-2.39740,-1.51103,1.36052,-1.86861,-1.14452,-0.71891 +4.81328,-2.39915,-1.51117,1.36135,-1.86861,-1.14377,-0.72064 +4.85477,-2.39932,-1.51118,1.36143,-1.86861,-1.14369,-0.72081 +4.89627,-2.40002,-1.51119,1.36169,-1.86859,-1.14339,-0.72149 +4.93776,-2.40178,-1.51109,1.36218,-1.86848,-1.14263,-0.72324 +4.97925,-2.40235,-1.51106,1.36235,-1.86845,-1.14238,-0.72380 +5.02075,-2.40461,-1.51096,1.36304,-1.86834,-1.14141,-0.72603 +5.06224,-2.40667,-1.51088,1.36368,-1.86823,-1.14053,-0.72806 +5.10373,-2.40854,-1.51081,1.36426,-1.86813,-1.13972,-0.72992 +5.14523,-2.41010,-1.51074,1.36473,-1.86804,-1.13905,-0.73146 +5.18672,-2.41166,-1.51060,1.36508,-1.86791,-1.13838,-0.73301 +5.22822,-2.41347,-1.51052,1.36563,-1.86781,-1.13761,-0.73481 +5.26971,-2.41449,-1.51047,1.36593,-1.86774,-1.13717,-0.73582 +5.31120,-2.41609,-1.51031,1.36628,-1.86761,-1.13649,-0.73741 +5.35270,-2.41833,-1.51013,1.36686,-1.86746,-1.13554,-0.73963 +5.39419,-2.42036,-1.50996,1.36738,-1.86732,-1.13467,-0.74165 +5.43568,-2.42222,-1.50982,1.36786,-1.86718,-1.13388,-0.74350 +5.47718,-2.42376,-1.50969,1.36824,-1.86706,-1.13323,-0.74504 +5.51867,-2.42528,-1.50947,1.36848,-1.86689,-1.13258,-0.74656 +5.56017,-2.42617,-1.50926,1.36850,-1.86676,-1.13221,-0.74744 +5.60166,-2.42836,-1.50834,1.36800,-1.86628,-1.13128,-0.74962 +5.64315,-2.43034,-1.50751,1.36752,-1.86583,-1.13045,-0.75160 +5.68465,-2.43215,-1.50675,1.36708,-1.86541,-1.12969,-0.75340 +5.72614,-2.43379,-1.50605,1.36666,-1.86501,-1.12899,-0.75505 +5.76763,-2.43457,-1.50574,1.36650,-1.86483,-1.12866,-0.75583 +5.80913,-2.43608,-1.50527,1.36637,-1.86454,-1.12803,-0.75734 +5.85062,-2.43792,-1.50447,1.36589,-1.86410,-1.12726,-0.75919 +5.89212,-2.43959,-1.50374,1.36544,-1.86368,-1.12656,-0.76087 +5.93361,-2.44084,-1.50318,1.36508,-1.86336,-1.12603,-0.76212 +5.97510,-2.44243,-1.50238,1.36450,-1.86291,-1.12537,-0.76372 +6.01660,-2.44303,-1.50207,1.36427,-1.86274,-1.12512,-0.76432 +6.05809,-2.44392,-1.50160,1.36390,-1.86247,-1.12474,-0.76522 +6.09959,-2.44467,-1.50118,1.36356,-1.86224,-1.12443,-0.76597 +6.14108,-2.44616,-1.50029,1.36280,-1.86174,-1.12381,-0.76748 +6.18257,-2.44768,-1.49930,1.36192,-1.86121,-1.12318,-0.76900 +6.22407,-2.44839,-1.49884,1.36150,-1.86095,-1.12288,-0.76972 +6.26556,-2.44925,-1.49826,1.36096,-1.86063,-1.12253,-0.77059 +6.30705,-2.45072,-1.49720,1.35995,-1.86006,-1.12192,-0.77207 +6.34855,-2.45141,-1.49670,1.35947,-1.85979,-1.12163,-0.77277 +6.39004,-2.45209,-1.49618,1.35897,-1.85951,-1.12134,-0.77346 +6.43154,-2.45292,-1.49556,1.35835,-1.85917,-1.12100,-0.77429 +6.47303,-2.45429,-1.49447,1.35726,-1.85858,-1.12043,-0.77568 +6.51452,-2.45509,-1.49383,1.35661,-1.85823,-1.12010,-0.77649 +6.55602,-2.45576,-1.49327,1.35603,-1.85793,-1.11982,-0.77717 +6.59751,-2.45716,-1.49207,1.35479,-1.85729,-1.11925,-0.77858 +6.63900,-2.45782,-1.49149,1.35418,-1.85697,-1.11897,-0.77926 +6.68050,-2.45920,-1.49026,1.35288,-1.85631,-1.11841,-0.78065 +6.72199,-2.45997,-1.48956,1.35213,-1.85594,-1.11809,-0.78144 +6.76349,-2.46063,-1.48895,1.35148,-1.85561,-1.11782,-0.78210 +6.80498,-2.46203,-1.48762,1.35004,-1.85490,-1.11724,-0.78353 +6.84647,-2.46331,-1.48639,1.34870,-1.85424,-1.11672,-0.78482 +6.88797,-2.46344,-1.48627,1.34857,-1.85417,-1.11667,-0.78495 +6.92946,-2.46406,-1.48566,1.34790,-1.85384,-1.11641,-0.78559 +6.97095,-2.46532,-1.48441,1.34652,-1.85317,-1.11589,-0.78687 +7.01245,-2.46545,-1.48428,1.34638,-1.85310,-1.11584,-0.78700 +7.05394,-2.46606,-1.48366,1.34569,-1.85276,-1.11559,-0.78762 +7.09544,-2.46681,-1.48291,1.34485,-1.85235,-1.11529,-0.78838 +7.13693,-2.46810,-1.48157,1.34335,-1.85164,-1.11476,-0.78969 +7.17842,-2.46870,-1.48094,1.34264,-1.85130,-1.11451,-0.79031 +7.21992,-2.46944,-1.48016,1.34177,-1.85088,-1.11421,-0.79106 +7.26141,-2.47071,-1.47880,1.34023,-1.85015,-1.11370,-0.79235 +7.30290,-2.47143,-1.47802,1.33934,-1.84972,-1.11340,-0.79309 +7.34440,-2.47269,-1.47664,1.33778,-1.84899,-1.11289,-0.79437 +7.38589,-2.47327,-1.47593,1.33693,-1.84860,-1.11265,-0.79497 +7.42739,-2.47436,-1.47403,1.33452,-1.84762,-1.11221,-0.79608 +7.46888,-2.47534,-1.47229,1.33229,-1.84670,-1.11181,-0.79709 +7.51037,-2.47608,-1.47099,1.33061,-1.84600,-1.11151,-0.79784 +7.55187,-2.47707,-1.46931,1.32847,-1.84511,-1.11110,-0.79886 +7.59336,-2.47763,-1.46836,1.32725,-1.84459,-1.11088,-0.79943 +7.63485,-2.47821,-1.46739,1.32601,-1.84407,-1.11064,-0.80003 +7.67635,-2.47939,-1.46555,1.32372,-1.84310,-1.11017,-0.80123 +7.71784,-2.48045,-1.46387,1.32160,-1.84220,-1.10974,-0.80232 +7.75934,-2.48133,-1.46246,1.31982,-1.84143,-1.10938,-0.80322 +7.80083,-2.48191,-1.46154,1.31866,-1.84093,-1.10915,-0.80382 +7.84232,-2.48241,-1.46077,1.31768,-1.84050,-1.10895,-0.80433 +7.88382,-2.48347,-1.45915,1.31565,-1.83963,-1.10852,-0.80542 +7.92531,-2.48406,-1.45824,1.31451,-1.83912,-1.10829,-0.80602 +7.96680,-2.48464,-1.45730,1.31332,-1.83861,-1.10805,-0.80663 +8.00830,-2.48557,-1.45553,1.31099,-1.83765,-1.10768,-0.80758 +8.04979,-2.48626,-1.45421,1.30925,-1.83693,-1.10740,-0.80829 +8.09129,-2.48677,-1.45323,1.30797,-1.83639,-1.10720,-0.80882 +8.13278,-2.48720,-1.45242,1.30691,-1.83595,-1.10702,-0.80927 +8.17427,-2.48773,-1.45146,1.30565,-1.83541,-1.10681,-0.80981 +8.21577,-2.48817,-1.45065,1.30460,-1.83497,-1.10663,-0.81026 +8.25726,-2.48870,-1.44970,1.30336,-1.83444,-1.10642,-0.81082 +8.29876,-2.48916,-1.44890,1.30233,-1.83400,-1.10624,-0.81128 +8.34025,-2.48971,-1.44794,1.30108,-1.83347,-1.10602,-0.81185 +8.38174,-2.49070,-1.44627,1.29895,-1.83256,-1.10562,-0.81287 +8.42324,-2.49125,-1.44533,1.29774,-1.83204,-1.10540,-0.81344 +8.46473,-2.49172,-1.44452,1.29669,-1.83159,-1.10522,-0.81392 +8.50622,-2.49259,-1.44269,1.29425,-1.83059,-1.10487,-0.81483 +8.54772,-2.49333,-1.44115,1.29219,-1.82974,-1.10457,-0.81559 +8.58921,-2.49421,-1.43939,1.28986,-1.82878,-1.10422,-0.81650 +8.63071,-2.49472,-1.43839,1.28853,-1.82822,-1.10402,-0.81702 +8.67220,-2.49563,-1.43666,1.28626,-1.82727,-1.10366,-0.81797 +8.71369,-2.49616,-1.43565,1.28494,-1.82671,-1.10345,-0.81852 +8.75519,-2.49720,-1.43381,1.28256,-1.82570,-1.10304,-0.81959 +8.79668,-2.49814,-1.43212,1.28036,-1.82477,-1.10267,-0.82056 +8.83817,-2.49859,-1.43132,1.27932,-1.82432,-1.10249,-0.82102 +8.87967,-2.49912,-1.43037,1.27807,-1.82378,-1.10228,-0.82157 +8.92116,-2.49958,-1.42956,1.27702,-1.82333,-1.10210,-0.82205 +8.96266,-2.50056,-1.42788,1.27485,-1.82239,-1.10171,-0.82306 +9.00415,-2.50111,-1.42694,1.27363,-1.82186,-1.10150,-0.82363 +9.04564,-2.50167,-1.42598,1.27239,-1.82132,-1.10128,-0.82421 +9.08714,-2.50266,-1.42433,1.27027,-1.82040,-1.10089,-0.82524 +9.12863,-2.50320,-1.42334,1.26897,-1.81985,-1.10068,-0.82579 +9.17012,-2.50393,-1.42133,1.26619,-1.81874,-1.10039,-0.82655 +9.21162,-2.50459,-1.41949,1.26361,-1.81770,-1.10013,-0.82724 +9.25311,-2.50472,-1.41913,1.26311,-1.81750,-1.10007,-0.82738 +9.29461,-2.50513,-1.41805,1.26161,-1.81689,-1.09991,-0.82780 +9.33610,-2.50588,-1.41620,1.25906,-1.81586,-1.09962,-0.82859 +9.37759,-2.50623,-1.41533,1.25786,-1.81536,-1.09948,-0.82895 +9.41909,-2.50667,-1.41429,1.25642,-1.81477,-1.09931,-0.82941 +9.46058,-2.50703,-1.41342,1.25523,-1.81427,-1.09916,-0.82979 +9.50207,-2.50748,-1.41239,1.25382,-1.81369,-1.09899,-0.83026 +9.54357,-2.50786,-1.41153,1.25266,-1.81320,-1.09884,-0.83066 +9.58506,-2.50833,-1.41051,1.25127,-1.81262,-1.09866,-0.83114 +9.62656,-2.50880,-1.40950,1.24989,-1.81204,-1.09847,-0.83163 +9.66805,-2.50919,-1.40866,1.24876,-1.81156,-1.09832,-0.83204 +9.70954,-2.50967,-1.40766,1.24740,-1.81099,-1.09813,-0.83254 +9.75104,-2.51008,-1.40682,1.24628,-1.81051,-1.09797,-0.83296 +9.79253,-2.51057,-1.40582,1.24494,-1.80994,-1.09778,-0.83347 +9.83402,-2.51099,-1.40498,1.24381,-1.80946,-1.09762,-0.83392 +9.87552,-2.51190,-1.40323,1.24150,-1.80848,-1.09726,-0.83486 +9.91701,-2.51241,-1.40225,1.24019,-1.80791,-1.09706,-0.83539 +9.95851,-2.51291,-1.40126,1.23886,-1.80734,-1.09687,-0.83590 +10.00000,-2.51318,-1.40055,1.23788,-1.80694,-1.09677,-0.83619 diff --git a/dmp/my_sol/run_dmp.py b/dmp/my_sol/run_dmp.py index be774e58af25b8e02c40a990de8fdc460e8f7154..6afd09252af1c5e314b1ec5438b5e9d8257a33c3 100644 --- a/dmp/my_sol/run_dmp.py +++ b/dmp/my_sol/run_dmp.py @@ -10,25 +10,21 @@ import os import time import signal import matplotlib.pyplot as plt +import sys +import copy +sys.path.insert(0, '../../util') +from give_me_the_calibrated_model import get_model -# TODO -# add scaling (point of albin's paper) -# generate this from other trajectories - - -#urdf_path_relative = "../../robot_descriptions/urdf/ur5e_with_robotiq_hande.urdf" -#urdf_path_absolute = os.path.abspath(urdf_path_relative) -#mesh_dir = "../../robot_descriptions/" -#mesh_dir_absolute = os.path.abspath(mesh_dir) -##print(mesh_dir_absolute) -#model = pin.buildModelFromUrdf(urdf_path_absolute) -##print(model) -#data = pin.Data(model) -##print(data) +urdf_path_relative = "../../robot_descriptions/urdf/ur5e_with_robotiq_hande.urdf" +urdf_path_absolute = os.path.abspath(urdf_path_relative) +mesh_dir = "../../robot_descriptions/" +mesh_dir_absolute = os.path.abspath(mesh_dir) +model, data = get_model(urdf_path_absolute, mesh_dir_absolute) rtde_control = RTDEControl("192.168.1.102") rtde_receive = RTDEReceive("192.168.1.102") rtde_io = RTDEIOInterface("192.168.1.102") +# on scale from 0 to 1 rtde_io.setSpeedSlider(0.2) # run if marker isn't gripped @@ -48,10 +44,10 @@ dmp_poss = np.zeros((N_ITER, 6)) dqs = np.zeros((N_ITER, 6)) dmp_vels = np.zeros((N_ITER, 6)) + def handler(signum, frame): print('sending 100 speedjs full of zeros') for i in range(100): - rtde_control.endFreedriveMode() vel_cmd = np.zeros(6) rtde_control.speedJ(vel_cmd, 0.1, 1.0 / 500) @@ -82,6 +78,9 @@ def handler(signum, frame): signal.signal(signal.SIGINT, handler) dmp = DMP() +current_pose = rtde_receive.getActualTCPPose() +current_pose[2] = current_pose[2] + 0.1 +rtde_control.moveL(current_pose) rtde_control.moveJ(dmp.pos.reshape((6,))) # TODO check that you're there instead of a sleep #t.sleep(3) @@ -91,6 +90,21 @@ update_rate = 500 dt = 1.0 / update_rate JOINT_ID = 6 +task_frame = [0, 0, 0, 0, 0, 0] +# these are in {0,1} and select which task frame direction compliance is active in +# just be soft everywhere +selection_vector = [1, 1, 1, 1, 1, 1] +# the wrench applied to the environment: +# position is adjusted to achieve the specified wrench +# let's pretend speedjs are this and see what happens (idk honestly) +wrench = [0, 0, 0, 0, 0, 0] +ftype = 2 +# limits for: +# - compliant axes: highest tcp velocities allowed on compliant axes +# - non-compliant axes: maximum tcp position error compared to the program (which prg, +# and where is this set?) +# why these values? +limits = [2, 2, 2, 2, 2, 2] # parameters from yaml config file in albin's repo kp = 2 @@ -109,6 +123,10 @@ else: a_max = np.ones(6) * 1.7 tc = TCVelAccConstrained(gamma_nominal, gamma_a, v_max, a_max, eps) +# TODO: check sign! +alpha = 0.1 +# lame hack for the current orientation (which it doesn't change so it's ok) +wrench_offset = np.array([-1.07988, -1.407225, -2.63069, 0.071115, -0.0487768, 0.089271]) print("starting the trajectory") for i in range(N_ITER): @@ -118,16 +136,35 @@ for i in range(N_ITER): # temporal coupling tau = dmp.tau + tc.update(dmp, dt) * dt dmp.set_tau(tau) - q = np.array(rtde_receive.getActualQ()) - dq = np.array(rtde_receive.getActualQd()) - vel_cmd = dmp.vel + kp * (dmp.pos - q.reshape((6,1))) + q = rtde_receive.getActualQ() + # TODO this fucker feel the weight of the gripper, this causes bias -> fix it! + wrench = np.array(rtde_receive.getActualTCPForce()) + wrench = wrench - wrench_offset + q6 = np.array(copy.deepcopy(q)) + q.append(0.0) + q.append(0.0) + q = np.array(q) + pin.forwardKinematics(model, data, q) + J = pin.computeJointJacobian(model, data, q, JOINT_ID) + dq = np.array(rtde_receive.getActualQd()).reshape((6,1)) + tau = J.T @ wrench + tau = tau[:6].reshape((6,1)) + vel_cmd = dmp.vel + kp * (dmp.pos - q6.reshape((6,1))) - alpha * tau vel_cmd = vel_cmd.reshape((6,)) vel_cmd = np.clip(vel_cmd, -1 * v_max, v_max) if np.isnan(vel_cmd[0]): break rtde_control.speedJ(vel_cmd, acceleration, dt) - - qs[i] = q.reshape((6,)) + # this is very stupind, but it was quick to implement + #vel_cmd8 = list(vel_cmd) + #vel_cmd8.append(0.0) + #vel_cmd8.append(0.0) + #vel_cmd8 = np.array(vel_cmd8) + #vel_tcp = J @ vel_cmd8 + #vel_tcp = vel_tcp * 10 + #rtde_control.forceMode(task_frame, selection_vector, vel_tcp, ftype, limits) + + qs[i] = q6.reshape((6,)) dmp_poss[i] = dmp.pos.reshape((6,)) dqs[i] = dq.reshape((6,)) dmp_vels[i] = dmp.vel.reshape((6,)) diff --git a/util/ft_readings.py b/util/ft_readings.py new file mode 100644 index 0000000000000000000000000000000000000000..cdb288cbd8c7ac7b49c764134f022939580cee52 --- /dev/null +++ b/util/ft_readings.py @@ -0,0 +1,46 @@ +import pinocchio as pin +import numpy as np +import sys +import os +from os.path import dirname, join, abspath +import time +from pinocchio.visualize import GepettoVisualizer +import gepetto.corbaserver +from rtde_control import RTDEControlInterface as RTDEControl +from rtde_receive import RTDEReceiveInterface as RTDEReceive +import os +import copy +import signal +from give_me_the_calibrated_model import get_model + +def handler(signum, frame): + print('i will end freedrive and exit') + rtde_control.endFreedriveMode() + exit() + + +rtde_control = RTDEControl("192.168.1.102") +rtde_receive = RTDEReceive("192.168.1.102") +while not rtde_control.isConnected(): + continue +print("connected") + +signal.signal(signal.SIGINT, handler) + +urdf_path_relative = "../robot_descriptions/urdf/ur5e_with_robotiq_hande.urdf" +urdf_path_absolute = os.path.abspath(urdf_path_relative) +mesh_dir = "../robot_descriptions/" +mesh_dir_absolute = os.path.abspath(mesh_dir) +model, data = get_model(urdf_path_absolute, mesh_dir_absolute) + +while True: + q = rtde_receive.getActualQ() + ft = rtde_receive.getActualTCPForce() + print(ft) +# q.append(0.0) +# q.append(0.0) +# pin.forwardKinematics(model, data, np.array(q)) +# print(data.oMi[6]) +# print("pin:", *data.oMi[6].translation.round(4), *pin.rpy.matrixToRpy(data.oMi[6].rotation).round(4)) +# print("ur5:", *np.array(rtde_receive.getActualTCPPose()).round(4)) +# time.sleep(0.005)