Skip to content

Convert nm to use new d-unittests #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjgollan-on-github merged 5 commits into from
Oct 23, 2025
Merged

Convert nm to use new d-unittests #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b098e8
util: Add a unittest-runner to utils
Alex-Muirhead Sep 19, 2025
2943d04
util: Add ability to skip tests
Alex-Muirhead Sep 17, 2025
b9b81f2
nm: Ensure all tests run with complex
Alex-Muirhead Sep 12, 2025
feac1cf
nm: Convert nm to use d-lang unittest
Alex-Muirhead Sep 12, 2025
c0a9bc0
src: Remove test_runner.d from util_files.mk
Alex-Muirhead Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 115 additions & 148 deletions src/nm/bbla.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import std.math;
import ntypes.complex;
import std.exception;

import nm.number;

class Matrix(T) {
size_t _nrows;
size_t _ncols;
Expand Down Expand Up @@ -661,49 +663,37 @@ do {
}
}


version(bbla_test) {
import util.msg_service;
@("test_basic_operations")
unittest {
import std.conv;
import ntypes.complex;
import nm.number;
int test_basic_operations() {
Matrix!number a = eye!number(3);
assert(approxEqualMatrix!number(a, new Matrix!number([[1,0,0],[0,1,0],[0,0,1]])),
failedUnitTest());
Matrix!number b = zeros!number(2,3);
Matrix!number c = transpose!number(b);
b[1,2] = to!number(99.0);
c[0,0] = to!number(1.0); c[1,1] = to!number(1.0);
assert(approxEqualMatrix!number(b, new Matrix!number([[0,0,0],[0,0,99]])),
failedUnitTest());
assert(approxEqualMatrix!number(c, new Matrix!number([[1,0],[0,1],[0,0]])),
failedUnitTest());

Matrix!number e = new Matrix!number([1.0, 2.0, 3.0]);
assert(approxEqualMatrix!number(e, new Matrix!number([[1],[2],[3]])),
failedUnitTest());
Matrix!number e2 = new Matrix!number([1, 2, 3], "row");
assert(approxEqualMatrix!number(e2, new Matrix!number([[1,2,3]])),
failedUnitTest());

Matrix!number f = new Matrix!number([[1.0,2.0,3.0],[4.0,5.0,6.0]]);
Matrix!number g = dot!number(f,c);
assert(approxEqualMatrix!number(g, new Matrix!number([[1,2],[4,5]])),
failedUnitTest());
g.zeros();
assert(approxEqualMatrix!number(g, new Matrix!number([[0,0],[0,0]])).
failedUnitTest());
dot!number(f, c, g);
assert(approxEqualMatrix!number(g, new Matrix!number([[1,2],[4,5]])),
failedUnitTest());

g.eye();
assert(approxEqualMatrix!number(g, new Matrix!number([[1,0],[0,1]])),
failedUnitTest());

return 0;
}

Matrix!number a = eye!number(3);
assert(approxEqualMatrix!number(a, new Matrix!number([[1, 0, 0], [0, 1, 0], [0, 0, 1]])));
Matrix!number b = zeros!number(2, 3);
Matrix!number c = transpose!number(b);
b[1, 2] = to!number(99.0);
c[0, 0] = to!number(1.0);
c[1, 1] = to!number(1.0);
assert(approxEqualMatrix!number(b, new Matrix!number([[0, 0, 0], [0, 0, 99]])));
assert(approxEqualMatrix!number(c, new Matrix!number([[1, 0], [0, 1], [0, 0]])));

Matrix!number e = new Matrix!number([1.0, 2.0, 3.0]);
assert(approxEqualMatrix!number(e, new Matrix!number([[1], [2], [3]])));
Matrix!number e2 = new Matrix!number([1, 2, 3], "row");
assert(approxEqualMatrix!number(e2, new Matrix!number([[1, 2, 3]])));

Matrix!number f = new Matrix!number([[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]);
Matrix!number g = dot!number(f, c);
assert(approxEqualMatrix!number(g, new Matrix!number([[1, 2], [4, 5]])));
g.zeros();
assert(approxEqualMatrix!number(g, new Matrix!number([[0, 0], [0, 0]])));
dot!number(f, c, g);
assert(approxEqualMatrix!number(g, new Matrix!number([[1, 2], [4, 5]])));

g.eye();
assert(approxEqualMatrix!number(g, new Matrix!number([[1, 0], [0, 1]])));
}


Expand Down Expand Up @@ -740,28 +730,30 @@ void gaussJordanElimination(T)(ref Matrix!T c, double very_small_value=1.0e-16)
} // end foreach j
} // end gaussJordanElimination()

version(bbla_test) {
int test_elimination() {
Matrix!number A = new Matrix!number([[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]]);
Matrix!number b = new Matrix!number([0.0, -2.0, -7.0, 6.0], "column");
Matrix!number Ab = hstack!number([A,b]);
Matrix!number Aonly = Ab.sliceDup(0, 4, 0, 4);
Matrix!number bonly = Ab.sliceDup(0, 4, 4, 5);
gaussJordanElimination!number(Ab);
assert(approxEqualMatrix!number(Ab, new Matrix!number([[1,0,0,0,-0.5],[0,1.0,0,0,1],
[0,0,1,0,1.0/3],[0,0,0,1,-2.0]])),
failedUnitTest());
number[] x = Ab.getColumn(4);
Matrix!number new_rhs = dot!number(Aonly, new Matrix!number(x));
assert(approxEqualMatrix!number(new_rhs, bonly), failedUnitTest());
Matrix!number residual = new_rhs - b;
assert(approxEqualMatrix!number(residual, new Matrix!number([0,0,0,0])), failedUnitTest());

return 0;
}
@("test_elimination")
unittest {
Matrix!number A = new Matrix!number([
[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]
]);
Matrix!number b = new Matrix!number([0.0, -2.0, -7.0, 6.0], "column");
Matrix!number Ab = hstack!number([A, b]);
Matrix!number Aonly = Ab.sliceDup(0, 4, 0, 4);
Matrix!number bonly = Ab.sliceDup(0, 4, 4, 5);
gaussJordanElimination!number(Ab);
assert(approxEqualMatrix!number(Ab, new Matrix!number([
[1, 0, 0, 0, -0.5],
[0, 1.0, 0, 0, 1],
[0, 0, 1, 0, 1.0 / 3],
[0, 0, 0, 1, -2.0]
])));
number[] x = Ab.getColumn(4);
Matrix!number new_rhs = dot!number(Aonly, new Matrix!number(x));
assert(approxEqualMatrix!number(new_rhs, bonly));
Matrix!number residual = new_rhs - b;
assert(approxEqualMatrix!number(residual, new Matrix!number([0, 0, 0, 0])));
}

/**
Expand Down Expand Up @@ -891,27 +883,23 @@ do {
}
}


version(bbla_test) {
int test_decomp_and_inverse() {
auto A = new Matrix!number([[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]]);
auto b = new Matrix!number([0.0, -2.0, -7.0, 6.0], "column");
auto c = new Matrix!number(A);
auto perm = decomp!number(c);
auto x = new Matrix!number(b);
solve!number(c, x, perm);
auto residual = b - dot!number(A,x);
assert(approxEqualMatrix!number(residual, new Matrix!number([0,0,0,0])),
failedUnitTest());

auto y = inverse!number(A);
assert(approxEqualMatrix!number(dot!number(A,y), eye!number(4)), failedUnitTest());

return 0;
}
@("test_decomp_and_inverse")
unittest {
auto A = new Matrix!number([
[0.0, 2.0, 0.0, 1.0], [2.0, 2.0, 3.0, 2.0], [4.0, -3.0, 0.0, 1.0], [
6.0, 1.0, -6.0, -5.0
]
]);
auto b = new Matrix!number([0.0, -2.0, -7.0, 6.0], "column");
auto c = new Matrix!number(A);
auto perm = decomp!number(c);
auto x = new Matrix!number(b);
solve!number(c, x, perm);
auto residual = b - dot!number(A, x);
assert(approxEqualMatrix!number(residual, new Matrix!number([0, 0, 0, 0])));

auto y = inverse!number(A);
assert(approxEqualMatrix!number(dot!number(A, y), eye!number(4)));
}

/**
Expand Down Expand Up @@ -953,25 +941,20 @@ Matrix!T lsqsolve(T)(const Matrix!T c, const Matrix!T rhs)
return x;
} // end lsqsolve()()

version(bbla_test) {
int test_lsqsolve() {
auto A = new Matrix!number([[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, 4.0, 6.0, 4.0],
[4.0, -3.0, 0.0, 1.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]]);
auto b = new Matrix!number([[ 0.0],
[-2.0],
[-4.0],
[-7.0],
[-7.0],
[ 6.0]]);
auto xx = lsqsolve!number(A, b);
auto expected_xx = new Matrix!number([-0.5, 1, 1.0/3, -2], "column");
assert(approxEqualMatrix!number(xx, expected_xx), failedUnitTest());
return 0;
}
@("test_lsqsolve")
unittest {
auto A = new Matrix!number([
[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, 4.0, 6.0, 4.0],
[4.0, -3.0, 0.0, 1.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]
]);
auto b = new Matrix!number([[0.0], [-2.0], [-4.0], [-7.0], [-7.0], [6.0]]);
auto xx = lsqsolve!number(A, b);
auto expected_xx = new Matrix!number([-0.5, 1, 1.0 / 3, -2], "column");
assert(approxEqualMatrix!number(xx, expected_xx));
}

/**
Expand Down Expand Up @@ -1076,50 +1059,34 @@ do {
}
}

version(bbla_test) {
int test_Crout_decomp_and_solve() {
auto A = new Matrix!number([[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]]);
number[] b = [to!number(0.0), to!number(-2.0), to!number(-7.0), to!number(6.0)];
int[] pivot;
pivot.length = 4;
number[] x;
x.length = 4;

LUDecomp!number(A, pivot);
LUSolve!number(A, pivot, b, x);

// Reset A since it was converted to LU format.
A = new Matrix!number([[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]]);

number[] Ax;
Ax.length = 4;
dot(A, x, Ax);

assert(approxEqualNumbers(b, Ax), failedUnitTest());

return 0;
}

int main() {
if ( test_basic_operations() != 0 )
return 1;
if ( test_elimination() != 0 )
return 1;
if ( test_decomp_and_inverse() != 0 )
return 1;
if ( test_lsqsolve() != 0 )
return 1;
if ( test_Crout_decomp_and_solve() != 0 )
return 1;

return 0;
}


@("test_Crout_decomp_and_solve")
unittest {
auto A = new Matrix!number([
[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]
]);
number[] b = [to!number(0.0), to!number(-2.0), to!number(-7.0), to!number(6.0)];
int[] pivot;
pivot.length = 4;
number[] x;
x.length = 4;

LUDecomp!number(A, pivot);
LUSolve!number(A, pivot, b, x);

// Reset A since it was converted to LU format.
A = new Matrix!number([
[0.0, 2.0, 0.0, 1.0],
[2.0, 2.0, 3.0, 2.0],
[4.0, -3.0, 0.0, 1.0],
[6.0, 1.0, -6.0, -5.0]
]);

number[] Ax;
Ax.length = 4;
dot(A, x, Ax);

assert(approxEqualNumbers(b, Ax));
}
21 changes: 9 additions & 12 deletions src/nm/bracketing.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,17 @@ int bracket(alias f, T)(ref T x1, ref T x2,
return -1;
} // end bracket()

version(bracketing_test) {
import util.msg_service;
unittest {
import std.conv;
import nm.number;
int main() {
number test_fun_2(number x, number a) {
return a*x + sin(x) - exp(x);
}
number my_a = 3.0;
auto test_fun_3 = delegate (number x) { return test_fun_2(x, my_a); };
number x1 = 0.4;
number x2 = 0.5;
assert(bracket!(test_fun_3,number)(x1, x2) == to!number(0), failedUnitTest());

return 0;
number test_fun_2(number x, number a) {
return a*x + sin(x) - exp(x);
}

number my_a = 3.0;
auto test_fun_3 = delegate (number x) { return test_fun_2(x, my_a); };
number x1 = 0.4;
number x2 = 0.5;
assert(bracket!(test_fun_3,number)(x1, x2) == to!number(0));
}
31 changes: 13 additions & 18 deletions src/nm/brent.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,27 +124,22 @@ T solve(alias f, T)(T x1, T x2, double tol=1.0e-9)
} // end solve()


version(brent_test) {
import util.msg_service;
unittest {
import std.conv;
import nm.number;
int main() {
@nogc number test_fun_1(number x) {
return pow(x,3) + pow(x,2) - 3*x - 3;
}
@nogc number test_fun_2(number x, number a) {
return a*x + sin(x) - exp(x);
}
assert(fabs(solve!(test_fun_1,number)(to!number(1), to!number(2)) - 1.732051) < 1.0e-5,
failedUnitTest());
number my_a = 3.0;
@nogc number test_fun_3 (number x) {
return test_fun_2(x, my_a);
}
assert(fabs(solve!(test_fun_3,number)(to!number(0), to!number(1)) - 0.3604217) < 1.0e-5,
failedUnitTest());

return 0;
@nogc number test_fun_1(number x) {
return pow(x,3) + pow(x,2) - 3*x - 3;
}
@nogc number test_fun_2(number x, number a) {
return a*x + sin(x) - exp(x);
}
assert(fabs(solve!(test_fun_1,number)(to!number(1), to!number(2)) - 1.732051) < 1.0e-5);
number my_a = 3.0;

@nogc number test_fun_3 (number x) {
return test_fun_2(x, my_a);
}
assert(fabs(solve!(test_fun_3,number)(to!number(0), to!number(1)) - 0.3604217) < 1.0e-5);
}

Loading