diff --git a/python/examples/drawing_from_input_drawing.py b/python/examples/drawing_from_input_drawing.py index da20eb870fbc3fd125d4166ab038f7b65337fadc..6e85c4f3cbcb8b0cdab7239362bae306ef72c247 100644 --- a/python/examples/drawing_from_input_drawing.py +++ b/python/examples/drawing_from_input_drawing.py @@ -346,18 +346,22 @@ if __name__ == "__main__": path_pose.translation = path_points_3D[i] path.append(plane_pose.act(path_pose)) - print( - """ - look at the viz now! we're constructing a trajectory for the drawing. - it has to look reasonable, otherwise we can't run it! - """ - ) + if args.viz_path: + print( + """ + look at the viz now! we're constructing a trajectory for the drawing. + it has to look reasonable, otherwise we can't run it! + """ + ) joint_trajectory = clikCartesianPathIntoJointPath(args, robot, path, \ clikController, q_init, plane_pose) - answer = input("did the movement of the manipulator look reasonable? [Y/n]") - if not (answer == "Y" or answer == "y"): - print("well if it doesn't look reasonable i'll just exit!") - answer = False + if args.viz_path: + answer = input("did the movement of the manipulator look reasonable? [Y/n]") + if not (answer == "Y" or answer == "y"): + print("well if it doesn't look reasonable i'll just exit!") + answer = False + else: + answer = True else: answer = True else: diff --git a/python/examples/joint_trajectory.csv b/python/examples/joint_trajectory.csv index d30743d2ab7fb15727a54cb658cc9b92c6d219ed..f2668f7a2d27fdeefd5fd7f825202cd137175a66 100644 --- a/python/examples/joint_trajectory.csv +++ b/python/examples/joint_trajectory.csv @@ -1,242 +1,191 @@ -0.00000,1.08972,-1.38876,-1.37899,-1.11145,1.95062,-0.31495 -0.04149,1.08968,-1.38875,-1.37900,-1.11144,1.95065,-0.31498 -0.08299,1.08964,-1.38875,-1.37901,-1.11144,1.95067,-0.31501 -0.12448,1.08961,-1.38876,-1.37900,-1.11144,1.95069,-0.31503 -0.16598,1.08958,-1.38877,-1.37898,-1.11145,1.95070,-0.31504 -0.20747,1.08956,-1.38878,-1.37895,-1.11147,1.95071,-0.31506 -0.24896,1.08955,-1.38880,-1.37890,-1.11149,1.95071,-0.31506 -0.29046,1.08954,-1.38883,-1.37884,-1.11151,1.95071,-0.31507 -0.33195,1.08980,-1.39061,-1.37454,-1.11352,1.95016,-0.31480 -0.37344,1.09031,-1.39245,-1.37009,-1.11559,1.94946,-0.31435 -0.41494,1.09201,-1.39593,-1.36157,-1.11956,1.94772,-0.31302 -0.45643,1.09758,-1.40242,-1.34505,-1.12736,1.94296,-0.30892 -0.49793,1.09991,-1.40444,-1.33958,-1.12998,1.94104,-0.30723 -0.53942,1.10236,-1.40633,-1.33438,-1.13250,1.93907,-0.30546 -0.58091,1.10533,-1.40817,-1.32897,-1.13514,1.93672,-0.30333 -0.62241,1.10767,-1.40947,-1.32505,-1.13707,1.93489,-0.30165 -0.66390,1.10957,-1.41037,-1.32217,-1.13851,1.93341,-0.30030 -0.70539,1.11204,-1.41124,-1.31899,-1.14012,1.93150,-0.29855 -0.74689,1.11656,-1.41246,-1.31393,-1.14275,1.92804,-0.29535 -0.78838,1.12078,-1.41326,-1.30988,-1.14491,1.92482,-0.29236 -0.82988,1.12529,-1.41383,-1.30612,-1.14696,1.92139,-0.28919 -0.87137,1.12999,-1.41420,-1.30263,-1.14892,1.91783,-0.28589 -0.91286,1.13566,-1.41429,-1.29910,-1.15099,1.91353,-0.28192 -0.95436,1.14156,-1.41412,-1.29597,-1.15291,1.90907,-0.27780 -0.99585,1.14681,-1.41391,-1.29333,-1.15454,1.90510,-0.27416 -1.03734,1.15300,-1.41347,-1.29061,-1.15632,1.90042,-0.26987 -1.07884,1.16376,-1.41200,-1.28721,-1.15882,1.89229,-0.26244 -1.12033,1.16725,-1.41144,-1.28628,-1.15957,1.88965,-0.26003 -1.16183,1.17083,-1.41079,-1.28548,-1.16026,1.88694,-0.25757 -1.20332,1.17614,-1.40944,-1.28499,-1.16100,1.88291,-0.25393 -1.24481,1.17841,-1.40880,-1.28489,-1.16127,1.88120,-0.25237 -1.28631,1.18175,-1.40775,-1.28494,-1.16158,1.87866,-0.25009 -1.32780,1.18523,-1.40656,-1.28519,-1.16182,1.87602,-0.24771 -1.36929,1.18758,-1.40571,-1.28543,-1.16195,1.87423,-0.24610 -1.41079,1.18874,-1.40529,-1.28557,-1.16201,1.87336,-0.24531 -1.45228,1.18995,-1.40483,-1.28573,-1.16206,1.87244,-0.24448 -1.49378,1.19111,-1.40439,-1.28590,-1.16210,1.87156,-0.24369 -1.53527,1.19354,-1.40342,-1.28633,-1.16216,1.86972,-0.24204 -1.57676,1.19572,-1.40246,-1.28687,-1.16215,1.86805,-0.24055 -1.61826,1.20030,-1.40012,-1.28862,-1.16187,1.86458,-0.23744 -1.65975,1.20504,-1.39752,-1.29071,-1.16146,1.86097,-0.23422 -1.70124,1.21350,-1.39180,-1.29642,-1.15990,1.85453,-0.22849 -1.74274,1.21608,-1.38992,-1.29840,-1.15932,1.85255,-0.22674 -1.78423,1.21967,-1.38728,-1.30120,-1.15850,1.84981,-0.22431 -1.82573,1.22338,-1.38442,-1.30435,-1.15756,1.84699,-0.22181 -1.86722,1.22864,-1.37989,-1.30963,-1.15587,1.84297,-0.21826 -1.90871,1.23437,-1.37411,-1.31686,-1.15341,1.83859,-0.21440 -1.95021,1.24112,-1.36633,-1.32707,-1.14983,1.83341,-0.20986 -1.99170,1.24425,-1.36239,-1.33239,-1.14792,1.83101,-0.20775 -2.03320,1.24828,-1.35687,-1.33999,-1.14517,1.82792,-0.20504 -2.07469,1.25016,-1.35408,-1.34390,-1.14373,1.82647,-0.20377 -2.11618,1.25211,-1.35124,-1.34788,-1.14228,1.82498,-0.20246 -2.15768,1.25300,-1.34983,-1.34989,-1.14154,1.82429,-0.20187 -2.19917,1.25432,-1.34765,-1.35301,-1.14038,1.82328,-0.20098 -2.24066,1.25520,-1.34624,-1.35504,-1.13963,1.82260,-0.20039 -2.28216,1.25650,-1.34406,-1.35817,-1.13847,1.82160,-0.19951 -2.32365,1.26175,-1.33371,-1.37344,-1.13270,1.81756,-0.19598 -2.36515,1.26444,-1.32667,-1.38420,-1.12854,1.81548,-0.19416 -2.40664,1.26617,-1.32118,-1.39276,-1.12521,1.81414,-0.19298 -2.44813,1.26759,-1.31566,-1.40150,-1.12177,1.81303,-0.19201 -2.48963,1.26844,-1.31055,-1.40977,-1.11846,1.81237,-0.19142 -2.53112,1.26881,-1.30714,-1.41538,-1.11621,1.81208,-0.19115 -2.57261,1.26901,-1.30295,-1.42237,-1.11337,1.81192,-0.19099 -2.61411,1.26856,-1.29925,-1.42882,-1.11068,1.81225,-0.19126 -2.65560,1.26551,-1.29300,-1.44076,-1.10545,1.81457,-0.19322 -2.69710,1.26097,-1.28784,-1.45153,-1.10053,1.81803,-0.19618 -2.73859,1.25506,-1.28326,-1.46196,-1.09560,1.82252,-0.20004 -2.78008,1.24685,-1.27934,-1.47239,-1.09041,1.82879,-0.20545 -2.82158,1.23851,-1.27701,-1.48027,-1.08625,1.83515,-0.21097 -2.86307,1.23001,-1.27538,-1.48708,-1.08251,1.84162,-0.21661 -2.90456,1.22172,-1.27446,-1.49266,-1.07930,1.84793,-0.22215 -2.94606,1.19736,-1.27506,-1.50380,-1.07206,1.86642,-0.23854 -2.98755,1.18703,-1.27579,-1.50785,-1.06929,1.87425,-0.24555 -3.02905,1.17486,-1.27760,-1.51116,-1.06662,1.88345,-0.25386 -3.07054,1.16638,-1.27870,-1.51377,-1.06467,1.88985,-0.25967 -3.11203,1.15744,-1.28006,-1.51627,-1.06272,1.89659,-0.26583 -3.15353,1.14402,-1.28240,-1.51961,-1.05999,1.90669,-0.27513 -3.19502,1.13231,-1.28474,-1.52215,-1.05778,1.91548,-0.28330 -3.23651,1.12224,-1.28700,-1.52399,-1.05603,1.92302,-0.29037 -3.27801,1.11225,-1.28944,-1.52556,-1.05442,1.93048,-0.29742 -3.31950,1.10664,-1.29091,-1.52631,-1.05358,1.93466,-0.30139 -3.36100,1.10111,-1.29244,-1.52694,-1.05279,1.93879,-0.30533 -3.40249,1.09435,-1.29448,-1.52745,-1.05195,1.94382,-0.31015 -3.44398,1.09159,-1.29534,-1.52764,-1.05161,1.94587,-0.31212 -3.48548,1.08721,-1.29667,-1.52799,-1.05106,1.94912,-0.31526 -3.52697,1.08229,-1.29804,-1.52860,-1.05036,1.95277,-0.31880 -3.56846,1.07579,-1.29968,-1.52973,-1.04932,1.95759,-0.32349 -3.60996,1.06930,-1.30117,-1.53112,-1.04818,1.96238,-0.32818 -3.65145,1.05953,-1.30268,-1.53453,-1.04595,1.96959,-0.33528 -3.69295,1.05293,-1.30330,-1.53753,-1.04418,1.97445,-0.34010 -3.73444,1.04787,-1.30349,-1.54032,-1.04263,1.97817,-0.34381 -3.77593,1.04361,-1.30331,-1.54325,-1.04110,1.98131,-0.34694 -3.81743,1.03871,-1.30266,-1.54738,-1.03904,1.98489,-0.35054 -3.85892,1.03459,-1.30184,-1.55131,-1.03714,1.98791,-0.35357 -3.90041,1.03130,-1.30106,-1.55467,-1.03553,1.99032,-0.35601 -3.94191,1.02718,-1.29958,-1.55972,-1.03318,1.99332,-0.35905 -3.98340,1.02227,-1.29744,-1.56636,-1.03015,1.99690,-0.36270 -4.02490,1.01811,-1.29545,-1.57229,-1.02746,1.99993,-0.36579 -4.06639,1.01466,-1.29374,-1.57733,-1.02520,2.00243,-0.36836 -4.10788,1.00890,-1.29042,-1.58651,-1.02112,2.00662,-0.37267 -4.14938,1.00768,-1.28968,-1.58852,-1.02023,2.00750,-0.37358 -4.19087,1.00649,-1.28891,-1.59054,-1.01934,2.00837,-0.37447 -4.23237,1.00588,-1.28851,-1.59160,-1.01888,2.00881,-0.37493 -4.27386,1.00531,-1.28813,-1.59260,-1.01844,2.00922,-0.37535 -4.31535,1.00471,-1.28771,-1.59367,-1.01797,2.00965,-0.37580 -4.35685,1.00415,-1.28732,-1.59468,-1.01753,2.01006,-0.37622 -4.39834,1.00412,-1.28732,-1.59470,-1.01752,2.01008,-0.37624 -4.43983,1.00410,-1.28733,-1.59469,-1.01752,2.01010,-0.37626 -4.48133,1.00407,-1.28735,-1.59467,-1.01753,2.01012,-0.37628 -4.52282,1.00404,-1.28739,-1.59462,-1.01754,2.01014,-0.37630 -4.56432,1.00402,-1.28744,-1.59457,-1.01756,2.01016,-0.37632 -4.60581,1.00302,-1.28945,-1.59193,-1.01850,2.01089,-0.37709 -4.64730,1.00182,-1.29216,-1.58829,-1.01982,2.01176,-0.37800 -4.68880,1.00057,-1.29554,-1.58357,-1.02156,2.01267,-0.37897 -4.73029,0.99882,-1.30035,-1.57682,-1.02406,2.01396,-0.38032 -4.77178,0.99313,-1.31478,-1.55675,-1.03154,2.01811,-0.38472 -4.81328,0.98798,-1.32603,-1.54149,-1.03725,2.02185,-0.38871 -4.85477,0.98301,-1.33605,-1.52811,-1.04227,2.02547,-0.39257 -4.89627,0.97918,-1.34331,-1.51853,-1.04587,2.02824,-0.39555 -4.93776,0.97578,-1.34975,-1.51003,-1.04909,2.03070,-0.39820 -4.97925,0.97103,-1.35850,-1.49855,-1.05345,2.03413,-0.40192 -5.02075,0.96625,-1.36720,-1.48714,-1.05781,2.03758,-0.40567 -5.06224,0.95291,-1.38854,-1.46029,-1.06802,2.04717,-0.41619 -5.10373,0.94865,-1.39535,-1.45171,-1.07134,2.05023,-0.41958 -5.14523,0.94639,-1.39901,-1.44705,-1.07315,2.05184,-0.42137 -5.18672,0.94290,-1.40452,-1.44013,-1.07583,2.05434,-0.42416 -5.22822,0.93789,-1.41224,-1.43052,-1.07957,2.05792,-0.42817 -5.26971,0.93211,-1.42090,-1.41985,-1.08372,2.06204,-0.43281 -5.31120,0.92627,-1.42954,-1.40928,-1.08786,2.06619,-0.43751 -5.35270,0.92257,-1.43503,-1.40254,-1.09051,2.06881,-0.44051 -5.39419,0.91892,-1.44046,-1.39587,-1.09314,2.07140,-0.44347 -5.43568,0.91661,-1.44403,-1.39141,-1.09492,2.07303,-0.44534 -5.47718,0.91307,-1.44950,-1.38460,-1.09763,2.07554,-0.44823 -5.51867,0.90941,-1.45541,-1.37712,-1.10064,2.07812,-0.45123 -5.56017,0.90524,-1.46226,-1.36839,-1.10417,2.08106,-0.45465 -5.60166,0.90237,-1.46726,-1.36187,-1.10682,2.08309,-0.45701 -5.64315,0.89893,-1.47370,-1.35328,-1.11035,2.08551,-0.45986 -5.68465,0.89698,-1.47743,-1.34827,-1.11242,2.08688,-0.46148 -5.72614,0.89575,-1.47978,-1.34511,-1.11373,2.08775,-0.46250 -5.76763,0.89504,-1.48118,-1.34321,-1.11452,2.08825,-0.46310 -5.80913,0.89456,-1.48209,-1.34200,-1.11502,2.08859,-0.46349 -5.85062,0.89404,-1.48304,-1.34073,-1.11554,2.08895,-0.46392 -5.89212,0.89331,-1.48443,-1.33886,-1.11632,2.08946,-0.46453 -5.93361,0.89191,-1.48722,-1.33507,-1.11790,2.09045,-0.46570 -5.97510,0.88953,-1.49311,-1.32658,-1.12148,2.09212,-0.46769 -6.01660,0.88739,-1.50054,-1.31515,-1.12636,2.09363,-0.46951 -6.05809,0.88621,-1.50617,-1.30613,-1.13026,2.09447,-0.47053 -6.09959,0.88560,-1.51052,-1.29889,-1.13341,2.09490,-0.47106 -6.14108,0.88544,-1.51507,-1.29092,-1.13691,2.09503,-0.47123 -6.18257,0.88539,-1.51791,-1.28590,-1.13913,2.09507,-0.47130 -6.22407,0.88541,-1.51947,-1.28309,-1.14037,2.09506,-0.47130 -6.26556,0.88543,-1.52026,-1.28166,-1.14100,2.09505,-0.47128 -6.30705,0.88553,-1.52183,-1.27877,-1.14229,2.09498,-0.47122 -6.34855,0.88572,-1.52461,-1.27365,-1.14456,2.09486,-0.47109 -6.39004,0.88643,-1.53163,-1.26050,-1.15043,2.09438,-0.47056 -6.43154,0.88748,-1.53938,-1.24574,-1.15705,2.09367,-0.46976 -6.47303,0.88889,-1.54665,-1.23151,-1.16347,2.09271,-0.46867 -6.51452,0.89028,-1.55199,-1.22075,-1.16835,2.09176,-0.46758 -6.55602,0.89220,-1.55795,-1.20840,-1.17399,2.09044,-0.46606 -6.59751,0.89296,-1.56017,-1.20377,-1.17611,2.08992,-0.46546 -6.63900,0.89348,-1.56165,-1.20066,-1.17754,2.08956,-0.46505 -6.68050,0.89402,-1.56312,-1.19756,-1.17896,2.08919,-0.46462 -6.72199,0.89457,-1.56458,-1.19446,-1.18039,2.08881,-0.46419 -6.76349,0.89548,-1.56661,-1.19003,-1.18244,2.08817,-0.46346 -6.80498,0.89805,-1.57011,-1.18156,-1.18639,2.08639,-0.46140 -6.84647,0.90023,-1.57233,-1.17576,-1.18913,2.08487,-0.45965 -6.88797,0.90276,-1.57432,-1.17007,-1.19184,2.08311,-0.45761 -6.92946,0.90453,-1.57533,-1.16679,-1.19343,2.08187,-0.45619 -6.97095,0.90620,-1.57613,-1.16398,-1.19479,2.08070,-0.45485 -7.01245,0.90797,-1.57683,-1.16127,-1.19612,2.07947,-0.45343 -7.05394,0.90942,-1.57741,-1.15904,-1.19721,2.07844,-0.45226 -7.09544,0.91324,-1.57846,-1.15405,-1.19968,2.07577,-0.44920 -7.13693,0.91672,-1.57902,-1.15023,-1.20161,2.07332,-0.44640 -7.17842,0.92265,-1.57934,-1.14494,-1.20434,2.06915,-0.44167 -7.21992,0.92819,-1.57942,-1.14042,-1.20671,2.06523,-0.43725 -7.26141,0.93514,-1.57890,-1.13595,-1.20914,2.06032,-0.43174 -7.30290,0.93999,-1.57822,-1.13343,-1.21056,2.05688,-0.42790 -7.34440,0.94425,-1.57754,-1.13140,-1.21173,2.05385,-0.42454 -7.38589,0.94879,-1.57646,-1.12990,-1.21268,2.05061,-0.42097 -7.42739,0.95151,-1.57570,-1.12922,-1.21315,2.04867,-0.41883 -7.46888,0.95347,-1.57512,-1.12880,-1.21346,2.04727,-0.41730 -7.51037,0.95910,-1.57308,-1.12829,-1.21403,2.04324,-0.41289 -7.55187,0.96654,-1.56978,-1.12878,-1.21426,2.03791,-0.40710 -7.59336,0.97559,-1.56475,-1.13128,-1.21368,2.03140,-0.40007 -7.63485,0.98309,-1.56019,-1.13416,-1.21285,2.02600,-0.39429 -7.67635,0.98973,-1.55597,-1.13710,-1.21193,2.02120,-0.38919 -7.71784,0.99461,-1.55284,-1.13934,-1.21124,2.01766,-0.38545 -7.75934,0.99647,-1.55162,-1.14024,-1.21094,2.01632,-0.38403 -7.80083,0.99926,-1.54972,-1.14174,-1.21045,2.01429,-0.38190 -7.84232,1.00116,-1.54840,-1.14281,-1.21009,2.01291,-0.38046 -7.88382,1.00305,-1.54706,-1.14392,-1.20971,2.01154,-0.37902 -7.92531,1.00400,-1.54638,-1.14449,-1.20951,2.01085,-0.37829 -7.96680,1.00585,-1.54504,-1.14564,-1.20911,2.00950,-0.37689 -8.00830,1.00775,-1.54365,-1.14685,-1.20869,2.00812,-0.37545 -8.04979,1.01251,-1.54006,-1.15009,-1.20755,2.00466,-0.37185 -8.09129,1.01821,-1.53567,-1.15415,-1.20610,2.00050,-0.36754 -8.13278,1.02381,-1.53109,-1.15866,-1.20446,1.99640,-0.36333 -8.17427,1.02761,-1.52801,-1.16170,-1.20335,1.99362,-0.36048 -8.21577,1.03238,-1.52414,-1.16552,-1.20196,1.99013,-0.35691 -8.25726,1.03433,-1.52256,-1.16708,-1.20140,1.98870,-0.35546 -8.29876,1.03621,-1.52097,-1.16872,-1.20079,1.98732,-0.35405 -8.34025,1.03814,-1.51934,-1.17039,-1.20018,1.98590,-0.35262 -8.38174,1.04098,-1.51684,-1.17303,-1.19920,1.98381,-0.35051 -8.42324,1.04383,-1.51425,-1.17585,-1.19814,1.98171,-0.34838 -8.46473,1.04575,-1.51244,-1.17786,-1.19738,1.98030,-0.34696 -8.50622,1.04860,-1.50969,-1.18097,-1.19619,1.97820,-0.34484 -8.54772,1.05144,-1.50690,-1.18416,-1.19498,1.97611,-0.34275 -8.58921,1.05426,-1.50409,-1.18742,-1.19373,1.97403,-0.34066 -8.63071,1.05630,-1.50190,-1.19005,-1.19271,1.97252,-0.33916 -8.67220,1.06210,-1.49486,-1.19902,-1.18915,1.96824,-0.33488 -8.71369,1.06510,-1.49094,-1.20415,-1.18709,1.96601,-0.33266 -8.75519,1.06803,-1.48690,-1.20957,-1.18491,1.96384,-0.33051 -8.79668,1.07087,-1.48274,-1.21524,-1.18261,1.96173,-0.32842 -8.83817,1.07297,-1.47944,-1.21983,-1.18074,1.96017,-0.32688 -8.87967,1.07504,-1.47595,-1.22479,-1.17871,1.95863,-0.32536 -8.92116,1.07673,-1.47305,-1.22893,-1.17701,1.95737,-0.32412 -8.96266,1.07869,-1.46947,-1.23410,-1.17489,1.95591,-0.32267 -9.00415,1.08031,-1.46650,-1.23840,-1.17312,1.95471,-0.32149 -9.04564,1.08189,-1.46358,-1.24264,-1.17138,1.95353,-0.32033 -9.08714,1.08377,-1.45994,-1.24798,-1.16918,1.95213,-0.31896 -9.12863,1.08703,-1.45196,-1.26016,-1.16410,1.94969,-0.31655 -9.17012,1.08977,-1.44374,-1.27307,-1.15868,1.94764,-0.31453 -9.21162,1.09157,-1.43693,-1.28403,-1.15405,1.94629,-0.31319 -9.25311,1.09255,-1.43226,-1.29169,-1.15079,1.94555,-0.31246 -9.29461,1.09322,-1.42841,-1.29807,-1.14808,1.94504,-0.31194 -9.33610,1.09371,-1.42543,-1.30304,-1.14596,1.94467,-0.31157 -9.37759,1.09423,-1.42159,-1.30948,-1.14322,1.94427,-0.31117 -9.41909,1.09433,-1.42076,-1.31088,-1.14262,1.94420,-0.31110 -9.46058,1.09447,-1.41909,-1.31373,-1.14140,1.94408,-0.31098 -9.50207,1.09456,-1.41740,-1.31664,-1.14015,1.94401,-0.31090 -9.54357,1.09471,-1.41531,-1.32021,-1.13862,1.94390,-0.31078 -9.58506,1.09477,-1.41368,-1.32304,-1.13740,1.94385,-0.31073 -9.62656,1.09478,-1.41198,-1.32602,-1.13612,1.94383,-0.31070 -9.66805,1.09475,-1.41034,-1.32890,-1.13488,1.94385,-0.31071 -9.70954,1.09430,-1.40544,-1.33775,-1.13104,1.94417,-0.31100 -9.75104,1.09412,-1.40383,-1.34066,-1.12977,1.94430,-0.31112 -9.79253,1.09390,-1.40224,-1.34357,-1.12851,1.94446,-0.31126 -9.83402,1.09389,-1.40220,-1.34364,-1.12847,1.94447,-0.31126 -9.87552,1.09378,-1.40143,-1.34506,-1.12785,1.94455,-0.31134 -9.91701,1.09365,-1.40062,-1.34655,-1.12720,1.94464,-0.31142 -9.95851,1.09352,-1.39985,-1.34796,-1.12659,1.94474,-0.31151 -10.00000,1.09351,-1.39981,-1.34804,-1.12656,1.94474,-0.31152 +0.00000,0.91603,-1.42930,-1.42367,-1.08082,2.07522,-0.44683 +0.05263,0.91599,-1.42930,-1.42368,-1.08081,2.07525,-0.44687 +0.10526,0.91594,-1.42931,-1.42368,-1.08081,2.07528,-0.44690 +0.15789,0.91590,-1.42932,-1.42369,-1.08081,2.07530,-0.44693 +0.21053,0.91586,-1.42932,-1.42369,-1.08080,2.07533,-0.44696 +0.26316,0.91582,-1.42934,-1.42368,-1.08081,2.07536,-0.44700 +0.31579,0.91577,-1.42936,-1.42367,-1.08081,2.07538,-0.44703 +0.36842,0.91574,-1.42938,-1.42365,-1.08082,2.07540,-0.44706 +0.42105,0.91570,-1.42940,-1.42362,-1.08083,2.07542,-0.44708 +0.47368,0.91570,-1.42943,-1.42357,-1.08086,2.07543,-0.44708 +0.52632,0.91570,-1.42945,-1.42352,-1.08088,2.07542,-0.44708 +0.57895,0.91586,-1.42967,-1.42286,-1.08119,2.07527,-0.44693 +0.63158,0.91806,-1.43128,-1.41719,-1.08387,2.07343,-0.44499 +0.68421,0.92030,-1.43242,-1.41264,-1.08605,2.07165,-0.44307 +0.73684,0.92385,-1.43359,-1.40696,-1.08880,2.06892,-0.44009 +0.78947,0.92605,-1.43420,-1.40373,-1.09037,2.06725,-0.43827 +0.84211,0.93031,-1.43501,-1.39841,-1.09299,2.06407,-0.43477 +0.89474,0.93332,-1.43537,-1.39512,-1.09463,2.06184,-0.43233 +0.94737,0.93765,-1.43588,-1.39055,-1.09691,2.05866,-0.42884 +1.00000,0.94323,-1.43579,-1.38614,-1.09920,2.05460,-0.42438 +1.05263,0.95004,-1.43490,-1.38230,-1.10133,2.04966,-0.41898 +1.10526,0.95555,-1.43363,-1.38028,-1.10259,2.04568,-0.41464 +1.15789,0.96144,-1.43182,-1.37897,-1.10356,2.04142,-0.41002 +1.21053,0.96856,-1.42914,-1.37836,-1.10433,2.03628,-0.40446 +1.26316,0.97170,-1.42790,-1.37822,-1.10461,2.03400,-0.40202 +1.31579,0.97627,-1.42607,-1.37809,-1.10499,2.03070,-0.39848 +1.36842,0.98278,-1.42328,-1.37830,-1.10536,2.02598,-0.39346 +1.42105,0.99140,-1.41921,-1.37930,-1.10555,2.01974,-0.38685 +1.47368,0.99948,-1.41478,-1.38142,-1.10524,2.01387,-0.38068 +1.52632,1.00572,-1.41108,-1.38357,-1.10478,2.00932,-0.37594 +1.57895,1.01185,-1.40707,-1.38639,-1.10404,2.00485,-0.37130 +1.63158,1.01580,-1.40418,-1.38875,-1.10334,2.00197,-0.36832 +1.68421,1.02091,-1.40010,-1.39240,-1.10218,1.99823,-0.36447 +1.73684,1.02605,-1.39555,-1.39689,-1.10068,1.99447,-0.36061 +1.78947,1.03216,-1.38974,-1.40293,-1.09860,1.98999,-0.35603 +1.84211,1.03819,-1.38371,-1.40943,-1.09634,1.98556,-0.35154 +1.89474,1.04316,-1.37869,-1.41491,-1.09444,1.98190,-0.34784 +1.94737,1.04718,-1.37452,-1.41951,-1.09283,1.97894,-0.34486 +2.00000,1.05399,-1.36764,-1.42703,-1.09024,1.97391,-0.33982 +2.05263,1.05700,-1.36464,-1.43030,-1.08912,1.97170,-0.33761 +2.10526,1.06037,-1.36100,-1.43444,-1.08768,1.96920,-0.33513 +2.15789,1.06473,-1.35588,-1.44048,-1.08553,1.96597,-0.33192 +2.21053,1.07328,-1.34348,-1.45637,-1.07969,1.95963,-0.32565 +2.26316,1.07887,-1.33343,-1.47006,-1.07455,1.95547,-0.32156 +2.31579,1.08285,-1.32510,-1.48176,-1.07011,1.95250,-0.31864 +2.36842,1.08539,-1.31949,-1.48971,-1.06710,1.95060,-0.31677 +2.42105,1.08848,-1.31249,-1.49965,-1.06334,1.94829,-0.31452 +2.47368,1.09254,-1.30195,-1.51492,-1.05754,1.94525,-0.31155 +2.52632,1.09618,-1.29151,-1.53020,-1.05175,1.94252,-0.30888 +2.57895,1.09892,-1.28316,-1.54247,-1.04712,1.94046,-0.30688 +2.63158,1.10061,-1.27678,-1.55206,-1.04347,1.93919,-0.30564 +2.68421,1.10151,-1.27244,-1.55871,-1.04092,1.93851,-0.30497 +2.73684,1.10204,-1.26966,-1.56298,-1.03929,1.93810,-0.30457 +2.78947,1.10235,-1.26733,-1.56665,-1.03787,1.93787,-0.30434 +2.84211,1.10244,-1.26656,-1.56785,-1.03741,1.93780,-0.30427 +2.89474,1.10253,-1.26275,-1.57407,-1.03498,1.93772,-0.30418 +2.94737,1.10214,-1.25929,-1.57997,-1.03262,1.93800,-0.30444 +3.00000,1.09954,-1.25473,-1.58892,-1.02887,1.93992,-0.30625 +3.05263,1.09450,-1.25071,-1.59839,-1.02468,1.94365,-0.30981 +3.10526,1.08638,-1.24732,-1.60863,-1.01991,1.94966,-0.31559 +3.15789,1.07369,-1.24538,-1.61925,-1.01457,1.95904,-0.32470 +3.21053,1.05745,-1.24572,-1.62840,-1.00949,1.97101,-0.33647 +3.26316,1.04007,-1.24851,-1.63451,-1.00554,1.98377,-0.34921 +3.31579,1.02828,-1.25093,-1.63794,-1.00317,1.99240,-0.35794 +3.36842,1.00717,-1.25522,-1.64438,-0.99888,2.00778,-0.37374 +3.42105,0.98847,-1.25947,-1.64970,-0.99530,2.02132,-0.38793 +3.47368,0.97217,-1.26373,-1.65366,-0.99250,2.03306,-0.40044 +3.52632,0.96423,-1.26581,-1.65566,-0.99113,2.03876,-0.40659 +3.57895,0.95285,-1.26914,-1.65806,-0.98936,2.04690,-0.41546 +3.63158,0.94132,-1.27226,-1.66104,-0.98739,2.05512,-0.42453 +3.68421,0.92713,-1.27550,-1.66585,-0.98456,2.06518,-0.43579 +3.73684,0.91552,-1.27761,-1.67077,-0.98191,2.07337,-0.44509 +3.78947,0.90558,-1.27906,-1.67566,-0.97940,2.08035,-0.45312 +3.84211,0.89010,-1.28140,-1.68336,-0.97549,2.09117,-0.46574 +3.89474,0.87770,-1.28278,-1.69046,-0.97205,2.09979,-0.47596 +3.94737,0.87080,-1.28303,-1.69530,-0.96982,2.10456,-0.48169 +4.00000,0.86349,-1.28309,-1.70081,-0.96733,2.10960,-0.48779 +4.05263,0.85989,-1.28280,-1.70404,-0.96592,2.11208,-0.49081 +4.10526,0.85775,-1.28253,-1.70613,-0.96502,2.11354,-0.49260 +4.15789,0.85528,-1.28220,-1.70855,-0.96397,2.11524,-0.49468 +4.21053,0.85079,-1.28142,-1.71330,-0.96196,2.11832,-0.49847 +4.26316,0.84544,-1.27989,-1.71990,-0.95921,2.12197,-0.50299 +4.31579,0.83978,-1.27767,-1.72787,-0.95596,2.12582,-0.50780 +4.36842,0.83730,-1.27660,-1.73152,-0.95448,2.12751,-0.50991 +4.42105,0.83427,-1.27515,-1.73622,-0.95259,2.12957,-0.51250 +4.47368,0.83309,-1.27456,-1.73807,-0.95185,2.13036,-0.51351 +4.52632,0.83249,-1.27426,-1.73903,-0.95146,2.13077,-0.51403 +4.57895,0.83246,-1.27424,-1.73908,-0.95144,2.13079,-0.51405 +4.63158,0.83189,-1.27395,-1.73999,-0.95108,2.13118,-0.51454 +4.68421,0.83071,-1.27333,-1.74191,-0.95031,2.13198,-0.51555 +4.73684,0.83062,-1.27329,-1.74205,-0.95026,2.13204,-0.51563 +4.78947,0.83059,-1.27328,-1.74209,-0.95024,2.13206,-0.51566 +4.84211,0.83056,-1.27326,-1.74213,-0.95022,2.13208,-0.51568 +4.89474,0.83053,-1.27325,-1.74218,-0.95021,2.13210,-0.51571 +4.94737,0.83050,-1.27324,-1.74221,-0.95019,2.13212,-0.51573 +5.00000,0.83048,-1.27324,-1.74223,-0.95018,2.13213,-0.51575 +5.05263,0.83045,-1.27325,-1.74224,-0.95018,2.13215,-0.51577 +5.10526,0.83043,-1.27328,-1.74222,-0.95019,2.13217,-0.51579 +5.15789,0.83030,-1.27346,-1.74203,-0.95025,2.13226,-0.51590 +5.21053,0.82482,-1.28333,-1.73092,-0.95398,2.13599,-0.52068 +5.26316,0.81957,-1.29387,-1.71852,-0.95828,2.13955,-0.52528 +5.31579,0.81592,-1.30166,-1.70912,-0.96159,2.14203,-0.52849 +5.36842,0.81343,-1.30771,-1.70153,-0.96432,2.14372,-0.53071 +5.42105,0.80680,-1.32449,-1.68011,-0.97212,2.14821,-0.53660 +5.47368,0.80185,-1.33615,-1.66543,-0.97752,2.15155,-0.54103 +5.52632,0.79932,-1.34200,-1.65810,-0.98024,2.15325,-0.54330 +5.57895,0.79405,-1.35332,-1.64418,-0.98542,2.15679,-0.54804 +5.63158,0.79026,-1.36108,-1.63477,-0.98894,2.15933,-0.55146 +5.68421,0.78520,-1.37153,-1.62204,-0.99374,2.16270,-0.55604 +5.73684,0.77216,-1.39971,-1.58707,-1.00713,2.17137,-0.56795 +5.78947,0.76747,-1.41014,-1.57394,-1.01226,2.17447,-0.57228 +5.84211,0.76480,-1.41651,-1.56572,-1.01550,2.17623,-0.57475 +5.89474,0.76184,-1.42417,-1.55558,-1.01952,2.17819,-0.57750 +5.94737,0.75818,-1.43465,-1.54135,-1.02522,2.18060,-0.58093 +6.00000,0.75454,-1.44745,-1.52312,-1.03259,2.18301,-0.58436 +6.05263,0.75139,-1.45971,-1.50525,-1.03989,2.18508,-0.58735 +6.10526,0.74879,-1.47066,-1.48905,-1.04657,2.18680,-0.58984 +6.15789,0.74694,-1.47882,-1.47684,-1.05163,2.18802,-0.59161 +6.21053,0.74491,-1.48894,-1.46140,-1.05807,2.18936,-0.59356 +6.26316,0.74300,-1.50151,-1.44156,-1.06642,2.19063,-0.59544 +6.31579,0.74189,-1.51392,-1.42112,-1.07510,2.19137,-0.59657 +6.36842,0.74180,-1.52481,-1.40222,-1.08321,2.19146,-0.59674 +6.42105,0.74197,-1.53121,-1.39084,-1.08813,2.19137,-0.59664 +6.47368,0.74224,-1.53396,-1.38575,-1.09034,2.19121,-0.59641 +6.52632,0.74253,-1.53647,-1.38106,-1.09238,2.19103,-0.59617 +6.57895,0.74262,-1.53717,-1.37974,-1.09296,2.19097,-0.59609 +6.63158,0.74272,-1.53787,-1.37841,-1.09353,2.19091,-0.59600 +6.68421,0.74283,-1.53855,-1.37710,-1.09411,2.19084,-0.59591 +6.73684,0.74440,-1.54642,-1.36169,-1.10085,2.18985,-0.59452 +6.78947,0.74525,-1.55015,-1.35427,-1.10411,2.18931,-0.59377 +6.84211,0.74641,-1.55446,-1.34548,-1.10799,2.18857,-0.59273 +6.89474,0.74794,-1.55935,-1.33531,-1.11248,2.18760,-0.59136 +6.94737,0.74935,-1.56353,-1.32650,-1.11640,2.18670,-0.59010 +7.00000,0.75148,-1.56856,-1.31544,-1.12133,2.18533,-0.58818 +7.05263,0.75387,-1.57341,-1.30444,-1.12625,2.18379,-0.58602 +7.10526,0.75687,-1.57734,-1.29445,-1.13077,2.18185,-0.58330 +7.15789,0.76411,-1.58344,-1.27641,-1.13901,2.17715,-0.57675 +7.21053,0.76764,-1.58546,-1.26932,-1.14228,2.17485,-0.57357 +7.26316,0.77007,-1.58666,-1.26478,-1.14439,2.17326,-0.57138 +7.31579,0.77401,-1.58767,-1.25912,-1.14705,2.17067,-0.56782 +7.36842,0.77751,-1.58811,-1.25494,-1.14905,2.16838,-0.56468 +7.42105,0.78121,-1.58822,-1.25118,-1.15086,2.16594,-0.56136 +7.47368,0.78464,-1.58821,-1.24789,-1.15246,2.16367,-0.55829 +7.52632,0.79062,-1.58804,-1.24250,-1.15509,2.15971,-0.55296 +7.57895,0.79616,-1.58765,-1.23795,-1.15732,2.15603,-0.54804 +7.63158,0.80078,-1.58756,-1.23379,-1.15936,2.15295,-0.54396 +7.68421,0.81099,-1.58678,-1.22572,-1.16336,2.14611,-0.53499 +7.73684,0.81677,-1.58588,-1.22203,-1.16524,2.14223,-0.52995 +7.78947,0.82106,-1.58513,-1.21949,-1.16655,2.13934,-0.52622 +7.84211,0.82537,-1.58430,-1.21708,-1.16780,2.13642,-0.52248 +7.89474,0.82875,-1.58339,-1.21567,-1.16857,2.13413,-0.51956 +7.94737,0.83269,-1.58223,-1.21424,-1.16938,2.13146,-0.51617 +8.00000,0.83444,-1.58166,-1.21371,-1.16969,2.13027,-0.51466 +8.05263,0.84322,-1.57836,-1.21190,-1.17088,2.12430,-0.50715 +8.10526,0.84802,-1.57643,-1.21118,-1.17141,2.12101,-0.50305 +8.15789,0.85359,-1.57394,-1.21084,-1.17181,2.11719,-0.49832 +8.21053,0.85734,-1.57218,-1.21078,-1.17200,2.11462,-0.49515 +8.26316,0.86152,-1.56991,-1.21128,-1.17197,2.11174,-0.49162 +8.31579,0.86465,-1.56797,-1.21211,-1.17174,2.10958,-0.48899 +8.36842,0.86761,-1.56582,-1.21348,-1.17127,2.10753,-0.48649 +8.42105,0.87215,-1.56184,-1.21682,-1.16999,2.10439,-0.48269 +8.47368,0.87368,-1.56040,-1.21812,-1.16948,2.10333,-0.48140 +8.52632,0.87516,-1.55885,-1.21968,-1.16886,2.10230,-0.48016 +8.57895,0.87822,-1.55483,-1.22436,-1.16692,2.10017,-0.47760 +8.63158,0.88072,-1.55082,-1.22949,-1.16476,2.09843,-0.47550 +8.68421,0.88477,-1.54120,-1.24340,-1.15878,2.09559,-0.47208 +8.73684,0.88748,-1.53291,-1.25605,-1.15330,2.09369,-0.46979 +8.78947,0.89083,-1.51856,-1.27893,-1.14336,2.09132,-0.46692 +8.84211,0.89201,-1.51349,-1.28702,-1.13985,2.09049,-0.46592 +8.89474,0.89325,-1.50704,-1.29750,-1.13530,2.08960,-0.46485 +8.94737,0.89454,-1.50064,-1.30781,-1.13084,2.08868,-0.46374 +9.00000,0.89592,-1.49353,-1.31932,-1.12588,2.08771,-0.46257 +9.05263,0.89696,-1.48716,-1.32975,-1.12138,2.08696,-0.46166 +9.10526,0.89783,-1.48157,-1.33892,-1.11743,2.08634,-0.46091 +9.15789,0.89866,-1.47601,-1.34805,-1.11351,2.08574,-0.46019 +9.21053,0.89923,-1.47181,-1.35498,-1.11053,2.08533,-0.45969 +9.26316,0.89954,-1.46899,-1.35969,-1.10851,2.08511,-0.45941 +9.31579,0.89979,-1.46619,-1.36440,-1.10649,2.08493,-0.45919 +9.36842,0.89997,-1.46338,-1.36918,-1.10444,2.08479,-0.45902 +9.42105,0.90024,-1.46007,-1.37477,-1.10204,2.08460,-0.45877 +9.47368,0.90040,-1.45807,-1.37814,-1.10060,2.08448,-0.45863 +9.52632,0.90056,-1.45529,-1.38288,-1.09857,2.08436,-0.45848 +9.57895,0.90080,-1.45200,-1.38842,-1.09620,2.08418,-0.45825 +9.63158,0.90146,-1.44752,-1.39571,-1.09312,2.08371,-0.45768 +9.68421,0.90192,-1.44483,-1.40003,-1.09130,2.08338,-0.45729 +9.73684,0.90234,-1.44285,-1.40314,-1.08999,2.08309,-0.45694 +9.78947,0.90263,-1.44150,-1.40526,-1.08911,2.08287,-0.45669 +9.84211,0.90295,-1.44010,-1.40744,-1.08819,2.08265,-0.45642 +9.89474,0.90327,-1.43875,-1.40955,-1.08731,2.08242,-0.45615 +9.94737,0.90361,-1.43734,-1.41172,-1.08641,2.08218,-0.45586 +10.00000,0.90362,-1.43730,-1.41179,-1.08638,2.08217,-0.45585 diff --git a/python/examples/path_in_pixels.csv b/python/examples/path_in_pixels.csv index f2435dcadce445d536b0164e242d12ca9a2273fe..2bbbb96bcfc2ce71d503d049039c7be9dbd00346 100644 --- a/python/examples/path_in_pixels.csv +++ b/python/examples/path_in_pixels.csv @@ -1,242 +1,191 @@ -0.27277,0.72161 -0.27277,0.72294 -0.27277,0.72694 -0.26980,0.73493 -0.26832,0.74159 -0.26684,0.74825 -0.26388,0.75758 -0.26092,0.76290 -0.25795,0.77223 -0.25647,0.77756 -0.25351,0.78688 -0.24610,0.80420 -0.24166,0.80952 -0.23869,0.81485 -0.23425,0.82018 -0.23129,0.82418 -0.22832,0.82684 -0.22388,0.82950 -0.21795,0.83483 -0.21203,0.83883 -0.20610,0.84282 -0.20018,0.84682 -0.19277,0.85082 -0.18536,0.85481 -0.17944,0.85881 -0.17203,0.86280 -0.15870,0.86813 -0.15425,0.86946 -0.14981,0.87080 -0.14240,0.87080 -0.13944,0.87080 -0.13500,0.87080 -0.13055,0.87080 -0.12759,0.87080 -0.12611,0.87080 -0.12463,0.87080 -0.12314,0.87080 -0.12018,0.87080 -0.11722,0.86946 -0.11129,0.86680 -0.10537,0.86547 -0.09500,0.85881 -0.09203,0.85614 -0.08759,0.85481 -0.08315,0.85215 -0.07722,0.84682 -0.07129,0.83883 -0.06389,0.82950 -0.06092,0.82418 -0.05648,0.81752 -0.05500,0.81352 -0.05204,0.81086 -0.05204,0.80819 -0.05055,0.80553 -0.04907,0.80420 -0.04759,0.80153 -0.04167,0.78821 -0.04018,0.77756 -0.03870,0.76956 -0.03722,0.76157 -0.03722,0.75358 -0.03722,0.74825 -0.03722,0.74159 -0.04018,0.73493 -0.04759,0.72294 -0.05500,0.71229 -0.06241,0.70163 -0.07278,0.69098 -0.08315,0.68298 -0.09203,0.67499 -0.10092,0.66833 -0.12611,0.65235 -0.13648,0.64569 -0.14981,0.64036 -0.15722,0.63370 -0.16610,0.62837 -0.17944,0.62038 -0.19129,0.61372 -0.20166,0.60839 -0.21203,0.60306 -0.21795,0.60040 -0.22388,0.59774 -0.23129,0.59507 -0.23425,0.59374 -0.23869,0.59108 -0.24314,0.58708 -0.24906,0.58175 -0.25499,0.57642 -0.26240,0.56577 -0.26684,0.55778 -0.26980,0.55112 -0.27129,0.54446 -0.27277,0.53646 -0.27425,0.52980 -0.27573,0.52448 -0.27573,0.51648 -0.27721,0.50716 -0.27869,0.49917 -0.28017,0.49251 -0.28166,0.48052 -0.28166,0.47786 -0.28166,0.47519 -0.28166,0.47386 -0.28166,0.47253 -0.28166,0.47120 -0.28166,0.46986 -0.28758,0.48585 -0.29203,0.49784 -0.29499,0.50716 -0.29943,0.51782 -0.30091,0.52181 -0.30240,0.52714 -0.30388,0.53114 -0.30536,0.53646 -0.30980,0.54179 -0.32462,0.55644 -0.33795,0.56577 -0.34980,0.57376 -0.35869,0.57909 -0.36610,0.58442 -0.37647,0.59108 -0.38684,0.59774 -0.41498,0.60972 -0.42387,0.61372 -0.42832,0.61638 -0.43572,0.61905 -0.44609,0.62304 -0.45795,0.62704 -0.46980,0.63104 -0.47720,0.63370 -0.48461,0.63636 -0.48906,0.63903 -0.49646,0.64169 -0.50387,0.64569 -0.51276,0.64968 -0.51868,0.65368 -0.52609,0.65901 -0.53054,0.66167 -0.53350,0.66300 -0.53498,0.66434 -0.53646,0.66434 -0.53794,0.66434 -0.53942,0.66567 -0.54239,0.66833 -0.54683,0.67632 -0.55128,0.68698 -0.55424,0.69497 -0.55572,0.70163 -0.55572,0.70962 -0.55720,0.71362 -0.55720,0.71628 -0.55720,0.71762 -0.55720,0.72028 -0.55868,0.72428 -0.56165,0.73493 -0.56461,0.74692 -0.56609,0.75891 -0.56609,0.76823 -0.56609,0.77889 -0.56609,0.78288 -0.56609,0.78555 -0.56609,0.78821 -0.56609,0.79088 -0.56461,0.79487 -0.55868,0.80286 -0.55424,0.80819 -0.54979,0.81352 -0.54535,0.81618 -0.54239,0.81885 -0.53942,0.82151 -0.53794,0.82418 -0.53202,0.82950 -0.52609,0.83350 -0.51720,0.84016 -0.50980,0.84682 -0.49943,0.85348 -0.49202,0.85748 -0.48609,0.86147 -0.47869,0.86414 -0.47424,0.86547 -0.47128,0.86680 -0.46239,0.86946 -0.45054,0.87213 -0.43572,0.87346 -0.42387,0.87479 -0.41350,0.87612 -0.40610,0.87746 -0.40313,0.87746 -0.39869,0.87746 -0.39573,0.87746 -0.39276,0.87746 -0.39128,0.87746 -0.38832,0.87746 -0.38536,0.87746 -0.37795,0.87746 -0.36906,0.87746 -0.36017,0.87612 -0.35425,0.87612 -0.34684,0.87612 -0.34388,0.87612 -0.34091,0.87479 -0.33795,0.87479 -0.33351,0.87346 -0.32906,0.87213 -0.32610,0.87080 -0.32165,0.86946 -0.31721,0.86813 -0.31277,0.86680 -0.30980,0.86414 -0.30091,0.85748 -0.29647,0.85348 -0.29203,0.84948 -0.28758,0.84549 -0.28462,0.84149 -0.28166,0.83750 -0.27869,0.83483 -0.27573,0.83084 -0.27277,0.82817 -0.26980,0.82551 -0.26684,0.82151 -0.26240,0.81086 -0.25795,0.80020 -0.25499,0.79088 -0.25351,0.78422 -0.25203,0.77889 -0.25055,0.77489 -0.24906,0.76956 -0.24906,0.76823 -0.24906,0.76557 -0.24906,0.76290 -0.24758,0.76024 -0.24758,0.75758 -0.24758,0.75491 -0.24758,0.75225 -0.24758,0.74426 -0.24758,0.74159 -0.24758,0.73893 -0.24758,0.73893 -0.24758,0.73760 -0.24758,0.73626 -0.24758,0.73493 -0.24758,0.73493 +0.47276,0.57909 +0.47276,0.57909 +0.47276,0.58042 +0.47276,0.58175 +0.47276,0.58308 +0.47572,0.58708 +0.47572,0.58974 +0.47572,0.59507 +0.47276,0.60040 +0.46239,0.61638 +0.45498,0.62304 +0.44906,0.62970 +0.44313,0.63636 +0.43869,0.64169 +0.43276,0.64835 +0.42980,0.65235 +0.42387,0.65901 +0.41943,0.66300 +0.41498,0.66966 +0.40610,0.67499 +0.39573,0.68032 +0.38684,0.68298 +0.37795,0.68565 +0.36758,0.68831 +0.36313,0.68964 +0.35721,0.69231 +0.34832,0.69497 +0.33647,0.69764 +0.32462,0.69764 +0.31573,0.69764 +0.30684,0.69630 +0.30091,0.69364 +0.29351,0.69098 +0.28610,0.68698 +0.27721,0.68298 +0.26832,0.67899 +0.26092,0.67632 +0.25499,0.67366 +0.24462,0.67100 +0.24018,0.66966 +0.23573,0.66567 +0.22981,0.66034 +0.21795,0.64569 +0.21055,0.63237 +0.20462,0.62171 +0.20018,0.61505 +0.19425,0.60706 +0.18684,0.59374 +0.17944,0.58042 +0.17351,0.56976 +0.17055,0.56044 +0.16907,0.55378 +0.16759,0.54978 +0.16759,0.54579 +0.16759,0.54446 +0.16759,0.53780 +0.16907,0.53114 +0.17647,0.52048 +0.18536,0.50982 +0.19573,0.49784 +0.21055,0.48452 +0.22832,0.47120 +0.24758,0.46054 +0.25943,0.45255 +0.27869,0.43523 +0.29647,0.42058 +0.31277,0.40859 +0.32017,0.40193 +0.33202,0.39394 +0.34239,0.38328 +0.35425,0.36863 +0.36313,0.35531 +0.37054,0.34332 +0.38387,0.32601 +0.39276,0.31002 +0.39573,0.29937 +0.40017,0.28871 +0.40017,0.28205 +0.40017,0.27806 +0.40165,0.27406 +0.40313,0.26607 +0.40313,0.25541 +0.40313,0.24342 +0.40313,0.23810 +0.40313,0.23144 +0.40313,0.22877 +0.40313,0.22744 +0.40313,0.22744 +0.40313,0.22611 +0.40313,0.22344 +0.40461,0.22344 +0.40461,0.22478 +0.40461,0.22478 +0.40461,0.22611 +0.40610,0.23010 +0.40758,0.23676 +0.41202,0.24476 +0.42091,0.25541 +0.43128,0.26740 +0.44165,0.27806 +0.45350,0.28738 +0.46239,0.29404 +0.46832,0.30070 +0.48757,0.31535 +0.50239,0.32334 +0.50980,0.32734 +0.52461,0.33400 +0.53498,0.33800 +0.54831,0.34466 +0.58387,0.36330 +0.59720,0.36996 +0.60461,0.37529 +0.61350,0.38195 +0.62535,0.39128 +0.63868,0.40460 +0.65201,0.41658 +0.66386,0.42724 +0.67275,0.43523 +0.68312,0.44589 +0.69497,0.46054 +0.70534,0.47652 +0.71275,0.49251 +0.71720,0.50183 +0.71720,0.50716 +0.71868,0.51116 +0.71868,0.51249 +0.71868,0.51382 +0.71868,0.51515 +0.72312,0.52847 +0.72460,0.53513 +0.72608,0.54312 +0.72757,0.55245 +0.72905,0.56044 +0.72905,0.57110 +0.72905,0.58175 +0.72460,0.59241 +0.71720,0.61239 +0.71127,0.62038 +0.70831,0.62571 +0.70090,0.63237 +0.69497,0.63770 +0.68905,0.64302 +0.68460,0.64835 +0.67720,0.65768 +0.66979,0.66567 +0.66535,0.67366 +0.65201,0.68831 +0.64312,0.69497 +0.63720,0.70030 +0.63127,0.70563 +0.62535,0.70829 +0.61942,0.71229 +0.61646,0.71362 +0.60313,0.72161 +0.59572,0.72561 +0.58683,0.72960 +0.58090,0.73227 +0.57350,0.73360 +0.56757,0.73360 +0.56165,0.73227 +0.55276,0.72960 +0.54979,0.72827 +0.54683,0.72561 +0.54091,0.71895 +0.53646,0.71229 +0.52905,0.69764 +0.52313,0.68698 +0.51276,0.66966 +0.50831,0.66434 +0.50387,0.65634 +0.49794,0.64968 +0.49202,0.64169 +0.48757,0.63370 +0.48313,0.62704 +0.47869,0.62038 +0.47572,0.61505 +0.47424,0.61106 +0.47276,0.60706 +0.47128,0.60306 +0.46832,0.59907 +0.46683,0.59640 +0.46535,0.59241 +0.46239,0.58841 +0.45646,0.58442 +0.45350,0.58175 +0.45054,0.58042 +0.44906,0.57909 +0.44758,0.57776 +0.44609,0.57642 +0.44461,0.57509 +0.44461,0.57509 diff --git a/python/examples/point_impedance_control.py b/python/examples/point_impedance_control.py index 953b41a1335fcf9032911fdc8dbcb7fb162834f0..5430e0b4bf296249b80eedb154825fa4f94eacaf 100644 --- a/python/examples/point_impedance_control.py +++ b/python/examples/point_impedance_control.py @@ -29,6 +29,8 @@ def getArgs(): default=0.001) parser.add_argument('--cartesian-space-impedance', action=argparse.BooleanOptionalAction, \ help="is the impedance computed and added in cartesian or in joint space", default=False) + parser.add_argument('--z-only', action=argparse.BooleanOptionalAction, \ + help="whether you have general impedance or just ee z axis", default=False) args = parser.parse_args() return args @@ -59,8 +61,10 @@ def controlLoopPointImpedance(args, q_init, controller, robot : RobotManager, i, # first-order low pass filtering instead # beta is a smoothing coefficient, smaller values smooth more, has to be in [0,1] wrench = args.beta * wrench + (1 - args.beta) * past_data['wrench'][-1] - Z = np.diag(np.array([1.0, 1.0, 1.0, 1.0, 1.0, 1.0])) - #Z = np.diag(np.array([0.0, 0.0, 1.0, 0.0, 0.0, 0.0])) + if not args.z_only: + Z = np.diag(np.array([1.0, 1.0, 1.0, 1.0, 1.0, 1.0])) + else: + Z = np.diag(np.array([0.0, 0.0, 1.0, 0.0, 0.0, 0.0])) #Z = np.diag(np.ones(6)) wrench = Z @ wrench @@ -108,7 +112,10 @@ def controlLoopCartesianPointImpedance(args, Mtool_init, clik_controller, robot # good generic values #Z = np.diag(np.array([1.0, 1.0, 2.0, 1.0, 1.0, 1.0])) # but let's stick to the default for now - Z = np.diag(np.array([1.0, 1.0, 1.0, 1.0, 1.0, 1.0])) + if not args.z_only: + Z = np.diag(np.array([1.0, 1.0, 1.0, 1.0, 1.0, 1.0])) + else: + Z = np.diag(np.array([0.0, 0.0, 1.0, 0.0, 0.0, 0.0])) #Z = np.diag(np.array([1.0, 1.0, 1.0, 10.0, 10.0, 10.0])) #Z = np.diag(np.array([0.0, 0.0, 1.0, 0.0, 0.0, 0.0])) diff --git a/python/ur_simple_control.egg-info/SOURCES.txt b/python/ur_simple_control.egg-info/SOURCES.txt index 0043b92a0efef223bc34ac44124e0f094d703d33..2ee2c2bb928eebc5b4fada560343da2315a9ec36 100644 --- a/python/ur_simple_control.egg-info/SOURCES.txt +++ b/python/ur_simple_control.egg-info/SOURCES.txt @@ -1,12 +1,11 @@ LICENSE.txt README.md -joint_trajectory.csv -path_in_pixels.csv setup.py convenience_tool_box/check_tcp_payload convenience_tool_box/currents.png convenience_tool_box/frame_validation.py convenience_tool_box/freedrive.py +convenience_tool_box/freedrive_v2.0.py convenience_tool_box/ft_readings.py convenience_tool_box/fts.png convenience_tool_box/jog_example @@ -16,10 +15,18 @@ convenience_tool_box/open_close_gripper.py convenience_tool_box/taus.png convenience_tool_box/__pycache__/give_me_the_calibrated_model.cpython-310.pyc convenience_tool_box/__pycache__/robotiq_gripper.cpython-310.pyc +examples/camera_no_lag.py +examples/casadi_ocp_collision_avoidance.py examples/clik.py +examples/comparing_logs_example.py +examples/crocoddyl_mpc.py +examples/crocoddyl_ocp_clik.py examples/drawing_from_input_drawing.py +examples/heron_pls.py examples/joint_trajectory.csv +examples/path_following_mpc.py examples/path_in_pixels.csv +examples/pin_contact3d.py examples/planar_dragging_via_top_contact_force.py examples/point_impedance_control.py examples/pushing_via_friction_cones.py @@ -27,11 +34,16 @@ examples/test_crocoddyl_opt_ctrl.py examples/test_gripper.py examples/test_movej.py examples/__pycache__/robotiq_gripper.cpython-310.pyc +examples/data/clik_comparison_0.pickle +examples/data/clik_comparison_1.pickle examples/data/clik_run_001.pickle examples/data/clik_run_001_args.pickle examples/data/fts.png examples/data/joint_trajectory.csv +examples/data/latest_run +examples/data/latest_run_0 examples/data/path_in_pixels.csv +examples/data/test2_0.pickle examples/old_or_experimental/clik_old.py examples/old_or_experimental/force_mode_api.py examples/old_or_experimental/forcemode_example.py @@ -108,6 +120,7 @@ ur_simple_control/basics/__pycache__/basics.cpython-310.pyc ur_simple_control/basics/__pycache__/basics.cpython-311.pyc ur_simple_control/basics/__pycache__/basics.cpython-312.pyc ur_simple_control/clik/__init__.py +ur_simple_control/clik/clik.py ur_simple_control/clik/__pycache__/__init__.cpython-310.pyc ur_simple_control/clik/__pycache__/__init__.cpython-311.pyc ur_simple_control/clik/__pycache__/__init__.cpython-312.pyc @@ -132,6 +145,12 @@ ur_simple_control/dmp/__pycache__/temporal_coupling.cpython-310.pyc ur_simple_control/dmp/trajectories/new_traj.csv ur_simple_control/dmp/trajectories/path_in_pixels.csv ur_simple_control/dmp/trajectories/ur10_omega_trajectory.csv +ur_simple_control/optimal_control/__init__.py +ur_simple_control/optimal_control/create_pinocchio_casadi_ocp.py +ur_simple_control/optimal_control/crocoddyl_mpc.py +ur_simple_control/optimal_control/crocoddyl_optimal_control.py +ur_simple_control/optimal_control/get_ocp_args.py +ur_simple_control/optimal_control/notes.md ur_simple_control/robot_descriptions/__init__.py ur_simple_control/robot_descriptions/my_robot_calibration.yaml ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-310.pyc @@ -178,10 +197,12 @@ ur_simple_control/robot_descriptions/urdf/__pycache__/__init__.cpython-312.pyc ur_simple_control/util/__init__.py ur_simple_control/util/calib_board_hacks.py ur_simple_control/util/draw_path.py +ur_simple_control/util/encapsulating_ellipses.py ur_simple_control/util/freedrive.py ur_simple_control/util/ft_calibration.py ur_simple_control/util/get_model.py ur_simple_control/util/logging_utils.py +ur_simple_control/util/map2DPathTo3DPlane.py ur_simple_control/util/path_in_pixels.csv ur_simple_control/util/__pycache__/__init__.cpython-310.pyc ur_simple_control/util/__pycache__/__init__.cpython-311.pyc @@ -205,9 +226,14 @@ ur_simple_control/util/__pycache__/logging_utils.cpython-312.pyc ur_simple_control/util/__pycache__/robotiq_gripper.cpython-310.pyc ur_simple_control/util/__pycache__/robotiq_gripper.cpython-311.pyc ur_simple_control/util/__pycache__/robotiq_gripper.cpython-312.pyc +ur_simple_control/util/grippers/__init__.py +ur_simple_control/util/grippers/abstract_gripper.py +ur_simple_control/util/grippers/on_robot/twofg.py +ur_simple_control/util/grippers/robotiq/robotiq_gripper.py ur_simple_control/visualize/__init__.py ur_simple_control/visualize/main.py ur_simple_control/visualize/make_run.py +ur_simple_control/visualize/manipulator_comparison_visualizer.py ur_simple_control/visualize/manipulator_visual_motion_analyzer.py ur_simple_control/visualize/visualize.py ur_simple_control/visualize/__pycache__/__init__.cpython-310.pyc @@ -230,6 +256,9 @@ ur_simple_control/visualize/arms/robot_parameters2 ur_simple_control/visualize/arms/testing_dh_parameters ur_simple_control/visualize/arms/ur10e_dh_parameters_from_the_ur_site ur_simple_control/visualize/arms/ur5e_dh +ur_simple_control/visualize/meshcat_viewer_wrapper/__init__.py +ur_simple_control/visualize/meshcat_viewer_wrapper/colors.py +ur_simple_control/visualize/meshcat_viewer_wrapper/visualizer.py ur_simple_control/visualize/robot_stuff/InverseKinematics.py ur_simple_control/visualize/robot_stuff/drawing.py ur_simple_control/visualize/robot_stuff/drawing_for_anim.py diff --git a/python/ur_simple_control/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/__pycache__/__init__.cpython-312.pyc index e85b1e4e44d05747ce2ca03bebd75077c0d0aa51..6cbe15e807a9d591b4daa2bb718e2ee6f594d68b 100644 Binary files a/python/ur_simple_control/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/__pycache__/managers.cpython-312.pyc b/python/ur_simple_control/__pycache__/managers.cpython-312.pyc index 3e0b90f31993c8fb68cd99ad680d26668eed0153..264baf9e4f1638bebd2db4c6ceb8f873c61fa407 100644 Binary files a/python/ur_simple_control/__pycache__/managers.cpython-312.pyc and b/python/ur_simple_control/__pycache__/managers.cpython-312.pyc differ diff --git a/python/ur_simple_control/basics/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/basics/__pycache__/__init__.cpython-312.pyc index 90f7a9633aa4ec8f8144b86339c2c17b3825f0c6..ab90bd5b2c4a7c3713769660b0a981284e5218e1 100644 Binary files a/python/ur_simple_control/basics/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/basics/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/basics/__pycache__/basics.cpython-312.pyc b/python/ur_simple_control/basics/__pycache__/basics.cpython-312.pyc index b1e46579879d5b082e636e725db1b2c84e396044..cc48db49956e5152a92dda0aa88ecd852b9cd0ee 100644 Binary files a/python/ur_simple_control/basics/__pycache__/basics.cpython-312.pyc and b/python/ur_simple_control/basics/__pycache__/basics.cpython-312.pyc differ diff --git a/python/ur_simple_control/clik/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/clik/__pycache__/__init__.cpython-312.pyc index f8bb567b50b60daa7ddfa22992641874ea904ffb..ae377943be843c28581a25e2d49812d836316b2d 100644 Binary files a/python/ur_simple_control/clik/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/clik/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/clik/clik.py b/python/ur_simple_control/clik/clik.py index 830838a8e20faf6c81df193b87b1b4d216ab451a..f73351a625cbabad575d484e6e0b8b65588cbb54 100644 --- a/python/ur_simple_control/clik/clik.py +++ b/python/ur_simple_control/clik/clik.py @@ -56,6 +56,8 @@ def getClikArgs(parser): help="number of max clik iterations to get to the first point", default=10000) parser.add_argument('--max-running-clik-iterations', type=int, \ help="number of max clik iterations between path points", default=1000) + parser.add_argument('--viz-path', action=argparse.BooleanOptionalAction, \ + help="number of max clik iterations between path points", default=False) return parser @@ -387,8 +389,9 @@ def clikCartesianPathIntoJointPath(args, robot, path, \ moveL(sim_args, sim_robot, pose) # loop logs is a dict, dict keys list preserves input order new_q = sim_robot.q.copy() - robot.updateViz(sim_robot.q, sim_robot.T_w_e) - time.sleep(0.05) + if args.viz_path: + robot.updateViz(sim_robot.q, sim_robot.T_w_e) + time.sleep(0.05) qs.append(new_q[:6]) # plot this on the real robot diff --git a/python/ur_simple_control/dmp/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/dmp/__pycache__/__init__.cpython-312.pyc index 2f9b2824737ebed52a6982e9abb3a3a070851fdd..7ea4cdffdac18fc953fc8e9b815ef847824199c3 100644 Binary files a/python/ur_simple_control/dmp/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/dmp/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/dmp/__pycache__/dmp.cpython-312.pyc b/python/ur_simple_control/dmp/__pycache__/dmp.cpython-312.pyc index af096cd0eb3d6119386239959f2086f901c097ba..625e7f6cada01c136ee98a287887a025f5e1de34 100644 Binary files a/python/ur_simple_control/dmp/__pycache__/dmp.cpython-312.pyc and b/python/ur_simple_control/dmp/__pycache__/dmp.cpython-312.pyc differ diff --git a/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-312.pyc index 0df7ddf44a0ede79323ae0b0a3406dd573af4f43..edcc33b2f845e875e6c72b885b613763e7842272 100644 Binary files a/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/robot_descriptions/urdf/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/robot_descriptions/urdf/__pycache__/__init__.cpython-312.pyc index 243f7ac617848687524177a64a28a389282e957c..6ad113721478b35bbd5d12ab47516bb8e525a9e8 100644 Binary files a/python/ur_simple_control/robot_descriptions/urdf/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/robot_descriptions/urdf/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/util/__pycache__/__init__.cpython-312.pyc index 388924771e93bdbcaeb01a6e13de839f5951627b..213dacf5bf110b7ab38111a6ec0543745a646fef 100644 Binary files a/python/ur_simple_control/util/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/util/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/calib_board_hacks.cpython-312.pyc b/python/ur_simple_control/util/__pycache__/calib_board_hacks.cpython-312.pyc index a2f53dd7883b0d046ebcfd3d6c264f4d33166614..35be94c5823e1b794d4e860079a820d5833a2d05 100644 Binary files a/python/ur_simple_control/util/__pycache__/calib_board_hacks.cpython-312.pyc and b/python/ur_simple_control/util/__pycache__/calib_board_hacks.cpython-312.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/draw_path.cpython-312.pyc b/python/ur_simple_control/util/__pycache__/draw_path.cpython-312.pyc index d52205a7faf1718a3c5d1dfcb332277f2b09b2ed..2c3ff4b5d9548da33d7e17b7acc30f20acf90019 100644 Binary files a/python/ur_simple_control/util/__pycache__/draw_path.cpython-312.pyc and b/python/ur_simple_control/util/__pycache__/draw_path.cpython-312.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/get_model.cpython-312.pyc b/python/ur_simple_control/util/__pycache__/get_model.cpython-312.pyc index e5301f4763c035b7f485882b0dc0b704b3e67228..18daa3d1842a6fdb72871be0062ebe3e3a1de737 100644 Binary files a/python/ur_simple_control/util/__pycache__/get_model.cpython-312.pyc and b/python/ur_simple_control/util/__pycache__/get_model.cpython-312.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/logging_utils.cpython-312.pyc b/python/ur_simple_control/util/__pycache__/logging_utils.cpython-312.pyc index b2dc997ac21e0a3d24f05b3c9b4ebdbd2abbcbe3..a3adaa98121287f462d494b5f9a5e08e370b88be 100644 Binary files a/python/ur_simple_control/util/__pycache__/logging_utils.cpython-312.pyc and b/python/ur_simple_control/util/__pycache__/logging_utils.cpython-312.pyc differ diff --git a/python/ur_simple_control/visualize/__pycache__/__init__.cpython-312.pyc b/python/ur_simple_control/visualize/__pycache__/__init__.cpython-312.pyc index 1a1afdfe38f2b1a2cc6ba93f9868783b4eb1aeb4..68ab8a11a32c6a9fe3e82b02daf0c28c1d668557 100644 Binary files a/python/ur_simple_control/visualize/__pycache__/__init__.cpython-312.pyc and b/python/ur_simple_control/visualize/__pycache__/__init__.cpython-312.pyc differ diff --git a/python/ur_simple_control/visualize/__pycache__/visualize.cpython-312.pyc b/python/ur_simple_control/visualize/__pycache__/visualize.cpython-312.pyc index 5658882128018a8131c79e369f6f1b119dee70f4..1dfd5ff4a37a424e79548a590c7d32a9aa37bd4d 100644 Binary files a/python/ur_simple_control/visualize/__pycache__/visualize.cpython-312.pyc and b/python/ur_simple_control/visualize/__pycache__/visualize.cpython-312.pyc differ