Maintenance for R2025b

Merge branch 'update-release' into release

Author: eszmw

.github/workflows/ci.yml

@@ -19,8 +19,10 @@ jobs:
     strategy: 
       fail-fast: false
       matrix:
-        MATLABVersion: [R2024a,R2024b]
+        MATLABVersion: [R2024b,R2025a,R2025b]
     runs-on: ubuntu-latest
+    env:
+      LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
     steps:
       # Checks-out your repository
       - uses: actions/checkout@v4

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 
 # <span style="color:rgb(213,80,0)">Calculus: Derivatives</span>
 
+Learn how to calculate derivatives, understand and use the product and chain rules, and compute Taylor polynomials.
 
 [![View on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/99249-calculus-derivatives) or [![Open in MATLAB Online](https://www.mathworks.com/images/responsive/global/open-in-matlab-online.svg)](https://matlab.mathworks.com/open/github/v1?repo=MathWorks-Teaching-Resources/Calculus-Derivatives&project=Derivatives.prj&file=README.mlx)
 
@@ -23,7 +24,7 @@ The instructions inside the live scripts will guide you through the exercises an
 
 ## Contact Us
 
-Solutions are available upon instructor request. Contact the [MathWorks teaching resources team](mailto:onlineteaching@mathworks.com) if you would like to request solutions, provide feedback, or if you have a question.
+Contact the [MathWorks Educator Content Development Team](mailto:onlineteaching@mathworks.com) if you would like to request assistance, provide feedback, or if you have a question.
 
 
 ## Prerequisites
@@ -111,14 +112,14 @@ The license for this module is available in the [LICENSE.md](https://github.com/
 |      |      |       |
 
 
-Or feel free to explore our other [modular courseware content](https://www.mathworks.com/matlabcentral/fileexchange/?q=tag%3A%22courseware+module%22&sort=downloads_desc_30d).
+Or feel free to explore our other [modular courseware content](https://www.mathworks.com/matlabcentral/fileexchange/?q=author%3A%22MathWorks+Educator+Content+Development+Team%22&sort=relevancy).
 
 # Educator Resources
 -  [Educator Page](https://www.mathworks.com/academia/educators.html) 
 
 # Contribute 
 
-Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks teaching resources team](mailto:%20onlineteaching@mathworks.com). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Calculus-Derivatives/blob/release/CONTRIBUTING.md)  page on GitHub.
+Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks Educator Content Development Team](mailto:%20onlineteaching@mathworks.com). If you want to contribute directly to this project, you can find information about how to do so in the [CONTRIBUTING.md](https://github.com/MathWorks-Teaching-Resources/Calculus-Derivatives/blob/release/CONTRIBUTING.md)  page on GitHub.
 
 
  *©* Copyright 2023 The MathWorks™, Inc

InstructorResources/Solutions/DefinitionSoln.mlx

@@ -31,8 +31,8 @@ function PostSmokeTest(ShowReport)
 
 % Format the results in a table and save them
 Results = table(Results');
-Results = Results(Results.Passed,:);
 Version = extractBetween(string(Results.Name),"Version=",")");
+Passed = logical(Results.Passed);
 
 % Add link to other report
 File = fileread(fullfile("public","index.html"));
@@ -45,13 +45,16 @@ function PostSmokeTest(ShowReport)
 % Format the JSON file
 Badge = struct;
 Badge.schemaVersion = 1;
-Badge.label = "Tested with";
-if size(Results,1) >= 1
-    Badge.color = "success"
+Badge.label = "Test Status";
+if all(Passed)
+    Badge.color = "success";
+    Badge.message = join("R"+Version," | ");
+elseif any(Passed)
+    Badge.color = "yellowgreen";
+    Badge.message = join("R"+Version(Passed)," | ");
+elseif all(~Passed)
+    Badge.color = "critical";
     Badge.message = join("R"+Version," | ");
-else
-    Badge.color = "failure";
-    Badge.message = "Pipeline fails";
 end
 Badge = jsonencode(Badge);
 writelines(Badge,fullfile("Images","TestedWith.json"));

MainMenu.mlx

@@ -2,26 +2,28 @@
 
     properties
         RootFolder
-    end
+        sparedEditors % Files already open when the test starts
+    end % properties
 
     properties (ClassSetupParameter)
         Project = {currentProject()};
-    end
+    end % ClassSetupParameter
 
     properties (TestParameter)
         File;
-    end
+    end % TestParameter
 
     methods (TestParameterDefinition,Static)
 
         function File = RetrieveFile(Project) %#ok<INUSD>
             % Retrieve student template files:
             RootFolder = currentProject().RootFolder;
-            File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
+            File = dir(fullfile(RootFolder,"Scripts","*.m"));
+            File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
             File = {File.name}; 
         end
 
-    end
+    end % Static TestParameterDefinition
 
     methods (TestClassSetup)
 
@@ -37,8 +39,28 @@ function SetUpSmokeTest(testCase,Project) %#ok<INUSD>
             testCase.log("Running in " + version)
         end
 
-    end
+    end % TestClassSetup
+
+    methods(TestMethodSetup)
+        function recordEditorsToSpare(testCase)
+            testCase.sparedEditors = matlab.desktop.editor.getAll;
+            testCase.sparedEditors = {testCase.sparedEditors.Filename};
+        end
+    end % TestMethodSetup
 
+    methods(TestMethodTeardown)
+        function closeOpenedEditors_thenDeleteWorkingDir(testCase)
+            openEditors = matlab.desktop.editor.getAll;
+            for editor=openEditors(1:end)
+                if any(strcmp(editor.Filename, testCase.sparedEditors))
+                    continue;
+                end
+                % if not on our list, close the file
+                editor.close();
+            end
+        end
+    end % TestMethodTeardown
+
     methods(Test)
 
         function SmokeRun(testCase,File)
@@ -90,13 +112,13 @@ function SmokeRun(testCase,File)
 
         end
 
-    end
+    end % Test Methods
 
 
     methods (Access = private)
 
        function Path = CheckPreFile(testCase,Filename)
-            PreFile = "Pre"+replace(Filename,".mlx",".m");
+            PreFile = "Pre"+extractBefore(Filename,".m")+".m";
             PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -112,7 +134,7 @@ function SmokeRun(testCase,File)
         end
 
         function Path = CheckPostFile(testCase,Filename)
-            PostFile = "Post"+replace(Filename,".mlx",".m");
+            PostFile = "Post"+extractBefore(Filename,".m")+".m";
             PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
@@ -125,6 +147,6 @@ function SmokeRun(testCase,File)
             Path = PostFilePath;
         end
 
-    end
+    end % Private Methods
 
-end
+end % Smoketests

README.md

@@ -39,7 +39,8 @@ function closeOpenedEditors_thenDeleteWorkingDir(testCase)
         function File = GetScriptName(Project)
             % Retrieve student template files:
             RootFolder = Project.RootFolder;
-            File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
+            File = dir(fullfile(RootFolder,"Scripts","*.m"));
+            File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
             File = {File.name};
         end
 
@@ -55,7 +56,7 @@ function SetUpPath(testCase,Project)
             % Check that solutions are on path:
             testCase.isSolnOnPath = isfolder("Solutions");
             if testCase.isSolnOnPath == 0
-                addpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions"))
+                addpath(genpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions")))
             end
 
             % Close the StartUp app if still open:
@@ -73,7 +74,7 @@ function SetUpPath(testCase,Project)
         % Check that solutions files exist for each of the student
         % templates
         function ExistSolns(testCase,File)
-            SolutionName = replace(string(File),".mlx","Soln.mlx");
+            SolutionName = replace(string(File),".m","Soln.m");
             assert(exist(SolutionName,"file"),"Missing solutions for "+File);
         end
 
@@ -82,7 +83,7 @@ function SmokeRun(testCase,File)
 
             % Navigate to project root folder:
             cd(testCase.RootFolder)
-            FileToRun = replace(string(File),".mlx","Soln.mlx");
+            FileToRun = replace(string(File),".m","Soln.m");
 
             % Pre-test:
             PreFiles = CheckPreFile(testCase,FileToRun);
@@ -132,7 +133,7 @@ function SmokeRun(testCase,File)
     methods (Access = private)
 
         function Path = CheckPreFile(testCase,Filename)
-            PreFile = "Pre"+replace(Filename,".mlx",".m");
+            PreFile = "Pre"+extractBefore(Filename,".m")+".m";
             PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -148,7 +149,7 @@ function SmokeRun(testCase,File)
         end
 
         function Path = CheckPostFile(testCase,Filename)
-            PostFile = "Post"+replace(Filename,".mlx",".m");
+            PostFile = "Post"+extractBefore(Filename,".m")+".m";
             PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
             if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
                 mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
@@ -163,4 +164,14 @@ function SmokeRun(testCase,File)
 
     end % Private Access Methods
 
+    methods (TestClassTeardown)
+
+        function ResetPath(testCase)
+            if ~testCase.isSolnOnPath && exist("Solutions","dir")
+                rmpath(genpath(fullfile(currentProject().RootFolder,"InstructorResources","Solutions")))
+            end
+        end
+
+    end % TestClassTeardown
+
 end % SolnSmokeTests