Update loadReducedModel.m

Use "fullfile" matlab function to concatenate paths
robotology · Dec 23, 2024 · 3d08ead · 3d08ead
1 parent 5ea59c9
commit 3d08ead
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/bindings/matlab/+iDynTreeWrappers/loadReducedModel.m b/bindings/matlab/+iDynTreeWrappers/loadReducedModel.m
@@ -25,6 +25,7 @@
     %% ------------Initialization----------------
     disp(['[loadReducedModel]: loading the following model: ',fullfile(modelPath,modelName)]);
 
+
     % if DEBUG option is set to TRUE, all the wrappers will be run in debug
     % mode. Wrappers concerning iDyntree simulator have their own debugger
     KinDynModel.DEBUG      = debugMode;
@@ -57,6 +58,7 @@
 
     % set the floating base link
     KinDynModel.kinDynComp.setFloatingBase(KinDynModel.BASE_LINK);
+<<<<<<< HEAD
 
     disp(['[loadReducedModel]: loaded model: ',fullfile(modelPath,modelName),', number of joints: ',num2str(KinDynModel.NDOF)]);
 
@@ -77,4 +79,8 @@
     KinDynModel.dynamics.M_iDyntree = iDynTree.MatrixDynSize(KinDynModel.NDOF+6,KinDynModel.NDOF+6);
     KinDynModel.dynamics.h_iDyntree = iDynTree.FreeFloatingGeneralizedTorques(KinDynModel.kinDynComp.model);
     KinDynModel.dynamics.g_iDyntree = iDynTree.FreeFloatingGeneralizedTorques(KinDynModel.kinDynComp.model);
+=======
+
+    disp(['[loadReducedModel]: loaded model: ',fullfile(modelPath,modelName),', number of joints: ',num2str(KinDynModel.NDOF)]);
+>>>>>>> b24f51530 (Update loadReducedModel.m)
 end