Removed _no_friction models and made associated changes

geez0x1 · Jan 16, 2019 · 5cbb143 · 5cbb143
1 parent 86e1d4f
commit 5cbb143
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 547 deletions.
diff --git a/examples/matlab/EX03_Batch_Build_Multiple_Joints.m b/examples/matlab/EX03_Batch_Build_Multiple_Joints.m
@@ -49,13 +49,6 @@
 
 % For each parameter file..
 for iPar = 1:nPar
-    % * No friction
-    jb.buildJoint(allParams{iPar}, 'full_dyn_no_friction');
-    jb.buildJoint(allParams{iPar}, 'output_fixed_no_friction');
-    jb.buildJoint(allParams{iPar}, 'rigid_gearbox_no_friction');
-    jb.buildJoint(allParams{iPar}, 'output_fixed_rigid_gearbox_no_friction');
-    jb.buildJoint(allParams{iPar}, 'rigid_no_friction');
-
     % * No nonlinearities
     jb.buildJoint(allParams{iPar}, 'full_dyn');
     jb.buildJoint(allParams{iPar}, 'output_fixed');
@@ -86,4 +79,4 @@
 % if you wish to remove all the files that have been created by the builder, call the jointBuilder purge method:
 %
 %   |jb.purge|
-%
+%
diff --git a/lib/jointBuilder.m b/lib/jointBuilder.m
@@ -134,16 +134,10 @@ function purge(this)
         % **modelName**: This is the name of the linear model template to be used. The following linear model templates can
         % be selected here:
         %   * *full_dyn*: Three mass system with motor, gear and load inertia. Gearbox and sensor are compliant.
-        %   * *full_dyn_no_friction*: As above, but without friction terms.
         %   * *output_fixed*: Two mass system with motor and gear inertia. The system output is locked.
-        %   * *output_fixed_no_friction*: Same as above, but without friction terms.
         %   * *output_fixed_rigid_gearbox*: Single mass spring damper system with locked output.
-        %   * *output_fixed_rigid_gearbox_no_friction*: As above, but without friction terms.
         %   * *rigid*: Single mass system without compliant elements.
-        %   * *rigid_no_friction*: As above, but without friction terms.
         %   * *rigid_gearbox*: Two mass system with combined motor-gearbox ineartia.
-        %   * *rigid_gearbox_no_friction*: As above, but without friction terms.
-        %
         %
         % **modelName** is an |OPTIONAL| input parameter and defaults to *full_dyn*
         %

diff --git a/model/linear/full_dyn.m b/model/linear/full_dyn.m
@@ -23,7 +23,7 @@
 %  Joern Malzahn
 %  Wesley Roozing
 %
-% See also full_dyn_no_friction, output_fixed.
+% See also output_fixed, rigid_gearbox.
 
 % Copyright (C) 2016, by Joern Malzahn, Wesley Roozing
 %

diff --git a/model/linear/full_dyn_no_friction.m b/model/linear/full_dyn_no_friction.m
diff --git a/model/linear/output_fixed_no_friction.m b/model/linear/output_fixed_no_friction.m
diff --git a/model/linear/output_fixed_rigid_gearbox_no_friction.m b/model/linear/output_fixed_rigid_gearbox_no_friction.m