diff --git a/QPInverseProblemSolverMatrices.txt b/QPInverseProblemSolverMatrices.txt index 0555da11536c4a6a693dc0b63bf67e3646815a54..3976c8d0aa2720bd344ae7a706ffbf3fe333f1cb 100644 --- a/QPInverseProblemSolverMatrices.txt +++ b/QPInverseProblemSolverMatrices.txt @@ -1,9 +1,9 @@ - Q = [[ 0.0814361 , -0.00827544 , -0.013763 ], -[ -0.00827544 , 0.0608328 , -0.0389114 ], -[ -0.013763 , -0.0389114 , 0.0458333 ], + Q = [[ 0.0858792 , -0.0385002 , -0.0356423 ], +[ -0.0385002 , 0.0766779 , -0.0337197 ], +[ -0.0356423 , -0.0337197 , 0.0957228 ], ]; - c = [ 1.96809 , -0.997536 , -0.685727 ]; + c = [ -0.674207 , -0.93156 , 1.25634 ]; A = [ ]; @@ -19,5 +19,5 @@ u = [ 150 , 150 , 150 ]; - lambda = [ -9.97107 , 49.6683 , 54.1344 ]; + lambda = [ 18.2729 , 21.9436 , 1.4091 ]; diff --git a/__pycache__/stiff_module.cpython-38.pyc b/__pycache__/stiff_module.cpython-38.pyc index 0711f005bbc43f2b8f577ea551932b03608d84b4..81db79dadaee7e481aa3256d2fdca8c3879a044f 100644 Binary files a/__pycache__/stiff_module.cpython-38.pyc and b/__pycache__/stiff_module.cpython-38.pyc differ diff --git a/stiff_module.py b/stiff_module.py index c8c091adfa28f08331c6ebe4e481380cae4fdca0..fd23dc33df6caca98626fec35aaf36479d098870 100644 --- a/stiff_module.py +++ b/stiff_module.py @@ -170,9 +170,9 @@ def MyScene(rootNode, out_flag,step,YM_soft_part,coef_poi,act_flag,data_exp): # rootNode.addObject(GoalPrinterCsv(stiff,rootNode)) # rootNode.addObject(PositionPrinterCsv(stiff,rootNode)) if act_flag == 0 : - rootNode.addObject(CircleTrajectory(RootNode = rootNode, rayon =25, nb_iter = 100)) - # rootNode.addObject(GoalKeyboardController(goal_pas,rootNode)) - # rootNode.addObject(GoalShift(rootNode)) + # rootNode.addObject(CircleTrajectory(RootNode = rootNode, rayon =25, nb_iter = 100)) + rootNode.addObject(GoalKeyboardController(goal_pas,rootNode)) + rootNode.addObject(GoalShift(rootNode)) rootNode.addObject(ArduinoPressure(module = stiff,RootNode = rootNode)) # pour envoyer les pressions calculées par le modèle inverse au robot (hardware) elif act_flag == 1 : rootNode.addObject(StiffController(pas=pas,module = stiff,RootNode = rootNode))