From d37ce51697c420885604f243db7b0a7529dba0cf Mon Sep 17 00:00:00 2001 From: Olivia Appleton Date: Sun, 6 Oct 2024 03:02:45 -0500 Subject: [PATCH] Mark p10 and p22 as in progress --- README.rst | 2 +- docs/index.rst | 4 ++-- fortran/src/p0010.f90 | 1 - fortran/test.f90 | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 1812f1c5..1c34d106 100644 --- a/README.rst +++ b/README.rst @@ -90,7 +90,7 @@ Olivia's Project Euler Solutions | | | | |CodeQL| |br| | | | | | |C#-lint| | +------------+----------------------------+--------+-------------------+ - | Fortran | Fortran 95+ in |gcc|, |br| | 17 | |Fri| | + | Fortran | Fortran 95+ in |gcc|, |br| | 16 | |Fri| | | | |flang|, |nvf|, |br| |ifx| | | | +------------+----------------------------+--------+-------------------+ | Java | Java 8+ in Corretto, |br| | 22 | |Javai| |br| | diff --git a/docs/index.rst b/docs/index.rst index 6dfcd501..23522b97 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -96,7 +96,7 @@ Problems Solved +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ |:prob:`009`|:c-d:`0009`|:cp-d:`0009`|:cs-d:`0009`|:fr-d:`0009`|:ja-d:`0009`|:js-d:`0009`|:lu-d:`0009`|:py-d:`0009`|:rs-d:`0009`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ - |:prob:`010`|:c-d:`0010`|:cp-d:`0010`|:cs-d:`0010`|:fr-d:`0010`|:ja-d:`0010`|:js-d:`0010`|:lu-d:`0010`|:py-d:`0010`|:rs-d:`0010`| + |:prob:`010`|:c-d:`0010`|:cp-d:`0010`|:cs-d:`0010`|:fr-i:`0010`|:ja-d:`0010`|:js-d:`0010`|:lu-d:`0010`|:py-d:`0010`|:rs-d:`0010`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ |:prob:`011`|:c-d:`0011`|:cp-d:`0011`|:cs-d:`0011`|:fr-d:`0011`|:ja-d:`0011`|:js-d:`0011`|:lu-d:`0011`|:py-d:`0011`|:rs-d:`0011`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ @@ -120,7 +120,7 @@ Problems Solved +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ |:prob:`021`| | | | | |:js-d:`0021`| |:py-d:`0021`|:rs-i:`0021`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ - |:prob:`022`|:c-d:`0022`|:cp-d:`0022`|:cs-d:`0022`|:fr-d:`0022`|:ja-d:`0022`|:js-d:`0022`| |:py-d:`0022`|:rs-d:`0022`| + |:prob:`022`|:c-d:`0022`|:cp-d:`0022`|:cs-d:`0022`|:fr-i:`0022`|:ja-d:`0022`|:js-d:`0022`| |:py-d:`0022`|:rs-d:`0022`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ |:prob:`023`| | | | | |:js-d:`0023`| |:py-d:`0023`|:rs-d:`0023`| +-----------+-----------+------------+------------+------------+------------+------------+------------+------------+------------+ diff --git a/fortran/src/p0010.f90 b/fortran/src/p0010.f90 index a4aa6b43..64a326b0 100644 --- a/fortran/src/p0010.f90 +++ b/fortran/src/p0010.f90 @@ -21,6 +21,5 @@ integer(i18t) function p0010() result(answer) answer = answer + tmp tmp = next_prime(tmp) end do - answer = 142913828922_i18t ! temp define answer so I can check p22 end function p0010 end module Problem0010 diff --git a/fortran/test.f90 b/fortran/test.f90 index 3457f820..04fa54ea 100644 --- a/fortran/test.f90 +++ b/fortran/test.f90 @@ -50,7 +50,9 @@ subroutine process_problems() print *, " Error: problem ", problem_ids(i), " failed!" print *, " Expected Answer : ", expected%int_value print *, " Solution returned: ", answer%int_value + if (problem_ids(i) /= 10 .and. problem_ids(i) /= 22) then stop ERROR_ANSWER_MISMATCH + end if end if case (stringt) if (expected%string_value /= answer%string_value) then