Skip to content

Commit e8af552

Browse files
committed
Maintenance for R2025b
* Update to new startup app * Improve ci.yml * Standardize project details * Remove reference to emailing for solutions in README as the solutions are included in Instructor Resources * Update identity as the MathWorks Educator Content Development team
1 parent 6071781 commit e8af552

File tree

192 files changed

+816
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+816
-311
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
MATLABVersion: [R2024a,R2024b]
22+
MATLABVersion: [R2024b,R2025a,R2025b]
2323
runs-on: ubuntu-latest
24+
env:
25+
LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
2426
steps:
2527
# Checks-out your repository
2628
- uses: actions/checkout@v4

.gitlab-ci.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

MainMenu.mlx

15 Bytes
Binary file not shown.

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# <span style="color:rgb(213,80,0)">Calculus \- Integrals</span>
33

4+
Learn how to compute Riemann sums, definite and indefinite integrals, and apply the methods of substitution and integration by parts.
45

56
[![View on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/105740-calculus-integrals) 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-Integrals&project=Integrals.prj&file=README.mlx)
67

@@ -22,11 +23,11 @@ You can use these live scripts as demonstrations in lectures, class activities,
2223
The instructions inside the live scripts will guide you through the exercises and activities. Get started with each live script by running it one section at a time. To stop running the script or a section midway (for example, when an animation is in progress), use the <img src="Images/EndIcon.png" width="19" alt="EndIcon.png"> Stop button in the **RUN** section of the **Live Editor** tab in the MATLAB Toolstrip.
2324

2425

25-
Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks online teaching team](mailto:%20onlineteaching@mathworks.com).
26+
Looking for more? Find an issue? Have a suggestion? Please contact the [MathWorks Educator Content Development team](https://www.mathworks.com/matlabcentral/profile/authors/37969341).
2627

2728
## Contact Us
2829

29-
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.
30+
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.
3031

3132

3233
## Prerequisites
@@ -95,16 +96,16 @@ The license for this module is available in the [LICENSE.md](https://github.com/
9596
| | | |
9697

9798

98-
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).
99+
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).
99100

100101
# Educator Resources
101102
- [Educator Page](https://www.mathworks.com/academia/educators.html)
102103

103104
# Contribute
104105

105-
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-Integrals/blob/release/CONTRIBUTING.md) page on GitHub.
106+
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-Integrals/blob/release/CONTRIBUTING.md) page on GitHub.
106107

107108

108-
*©* Copyright 2024 The MathWorks, Inc
109+
*©* Copyright 2025 The MathWorks, Inc
109110

110111

README.mlx

-8 Bytes
Binary file not shown.

SoftwareTests/PostSmokeTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function PostSmokeTest(ShowReport)
3232
% Format the results in a table and save them
3333
Results = table(Results');
3434
Version = extractBetween(string(Results.Name),"Version=",")");
35-
Passed = Results.Passed;
35+
Passed = logical(Results.Passed);
3636

3737
% Add link to other report
3838
File = fileread(fullfile("public","index.html"));
@@ -51,7 +51,7 @@ function PostSmokeTest(ShowReport)
5151
Badge.message = join("R"+Version," | ");
5252
elseif any(Passed)
5353
Badge.color = "yellowgreen";
54-
Badge.message = join("R")
54+
Badge.message = join("R"+Version(Passed)," | ");
5555
elseif all(~Passed)
5656
Badge.color = "critical";
5757
Badge.message = join("R"+Version," | ");

SoftwareTests/SmokeTests.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
function File = RetrieveFile(Project) %#ok<INUSD>
1919
% Retrieve student template files:
2020
RootFolder = currentProject().RootFolder;
21-
File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
21+
File = dir(fullfile(RootFolder,"Scripts","*.m"));
22+
File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
2223
File = {File.name};
2324
end
2425

@@ -117,7 +118,7 @@ function SmokeRun(testCase,File)
117118
methods (Access = private)
118119

119120
function Path = CheckPreFile(testCase,Filename)
120-
PreFile = "Pre"+replace(Filename,".mlx",".m");
121+
PreFile = "Pre"+extractBefore(Filename,".m")+".m";
121122
PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
122123
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
123124
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -133,7 +134,7 @@ function SmokeRun(testCase,File)
133134
end
134135

135136
function Path = CheckPostFile(testCase,Filename)
136-
PostFile = "Post"+replace(Filename,".mlx",".m");
137+
PostFile = "Post"+extractBefore(Filename,".m")+".m";
137138
PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
138139
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
139140
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))

SoftwareTests/SolnSmokeTests.m

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ function closeOpenedEditors_thenDeleteWorkingDir(testCase)
3939
function File = GetScriptName(Project)
4040
% Retrieve student template files:
4141
RootFolder = Project.RootFolder;
42-
File = dir(fullfile(RootFolder,"Scripts","*.mlx"));
42+
File = dir(fullfile(RootFolder,"Scripts","*.m"));
43+
File = [File; dir(fullfile(RootFolder,"Scripts","*.mlx"))];
4344
File = {File.name};
4445
end
4546

@@ -55,7 +56,7 @@ function SetUpPath(testCase,Project)
5556
% Check that solutions are on path:
5657
testCase.isSolnOnPath = isfolder("Solutions");
5758
if testCase.isSolnOnPath == 0
58-
addpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions"))
59+
addpath(genpath(fullfile(testCase.RootFolder,"InstructorResources","Solutions")))
5960
end
6061

6162
% Close the StartUp app if still open:
@@ -73,7 +74,7 @@ function SetUpPath(testCase,Project)
7374
% Check that solutions files exist for each of the student
7475
% templates
7576
function ExistSolns(testCase,File)
76-
SolutionName = replace(string(File),".mlx","Soln.mlx");
77+
SolutionName = replace(string(File),".m","Soln.m");
7778
assert(exist(SolutionName,"file"),"Missing solutions for "+File);
7879
end
7980

@@ -82,7 +83,7 @@ function SmokeRun(testCase,File)
8283

8384
% Navigate to project root folder:
8485
cd(testCase.RootFolder)
85-
FileToRun = replace(string(File),".mlx","Soln.mlx");
86+
FileToRun = replace(string(File),".m","Soln.m");
8687

8788
% Pre-test:
8889
PreFiles = CheckPreFile(testCase,FileToRun);
@@ -132,7 +133,7 @@ function SmokeRun(testCase,File)
132133
methods (Access = private)
133134

134135
function Path = CheckPreFile(testCase,Filename)
135-
PreFile = "Pre"+replace(Filename,".mlx",".m");
136+
PreFile = "Pre"+extractBefore(Filename,".m")+".m";
136137
PreFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PreFiles",PreFile);
137138
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
138139
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PreFiles"))
@@ -148,7 +149,7 @@ function SmokeRun(testCase,File)
148149
end
149150

150151
function Path = CheckPostFile(testCase,Filename)
151-
PostFile = "Post"+replace(Filename,".mlx",".m");
152+
PostFile = "Post"+extractBefore(Filename,".m")+".m";
152153
PostFilePath = fullfile(testCase.RootFolder,"SoftwareTests","PostFiles",PostFile);
153154
if ~isfolder(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
154155
mkdir(fullfile(testCase.RootFolder,"SoftwareTests/PostFiles"))
@@ -163,4 +164,14 @@ function SmokeRun(testCase,File)
163164

164165
end % Private Access Methods
165166

167+
methods (TestClassTeardown)
168+
169+
function ResetPath(testCase)
170+
if ~testCase.isSolnOnPath && exist("Solutions","dir")
171+
rmpath(genpath(fullfile(currentProject().RootFolder,"InstructorResources","Solutions")))
172+
end
173+
end
174+
175+
end % TestClassTeardown
176+
166177
end % SolnSmokeTests

SoftwareTests/TestResults_R2023b.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

SoftwareTests/TestResults_R2024a.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)