Skip to content
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.

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

Miscelaneous updates (second batch) #18

Merged
merged 58 commits into from
May 8, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
1414dcc
Alloc/Dealloc commit
Jan 29, 2019
4162c3e
more_sorensen_noew single exit address
Jan 29, 2019
31fa32e
USE/ONLY
Jan 30, 2019
1c93bd3
Single exit address
Jan 30, 2019
e4bd2fb
Printing Module
Jan 31, 2019
71bdae5
update to CMAKE to include printing module
Jan 31, 2019
be17388
Printing implementation proposal
Jan 31, 2019
a5d9f78
PrintMSG and BuildMSG
Feb 1, 2019
3c79720
PrintMSG and BuildMSG (cont.)
Feb 4, 2019
bd8c1b5
Missing printmsg
Feb 5, 2019
bbc66c5
Armor (test)
Feb 5, 2019
3cee0c3
LAPACK iface+update+partialfix
Feb 14, 2019
2f438ae
LAPACK interface check fails for w%ew(1) instead of w%ew(n)
Feb 18, 2019
46be524
cosmetic change for pre-NAG-patch of DLAMCH removal
Feb 18, 2019
eb995ab
Do not iterate if x0 is solution point!
Feb 18, 2019
caaf7c7
Init workspace%normd = huge
Feb 18, 2019
012b15b
Add print_bye routine to print exit summary
Feb 18, 2019
eef0dfd
add new `step=w%normd` element to nlls_inform
Feb 18, 2019
0c01d35
move exit summary/error printing to print_bye and added updates for i…
Feb 18, 2019
b2c32df
Fix duplicate printing of same exit error
Mar 1, 2019
4eae62f
Check Options
Mar 1, 2019
85119b1
Constants (partial replacement)
Mar 1, 2019
064a356
require v3 of CMake
tyronerees Mar 14, 2019
3389429
put langage into the project
tyronerees Mar 14, 2019
3336595
remove half-baked mkl support
tyronerees Mar 14, 2019
bfa8f5c
remove commented out hsl files
tyronerees Mar 14, 2019
1b9e509
Tidy up flags
tyronerees Mar 14, 2019
a80104e
Fix project types supported
tyronerees Mar 14, 2019
316c3db
Move blas section
tyronerees Mar 15, 2019
e72ecc6
Add Fortran coverage, and remove need for c++ compiler
tyronerees Mar 15, 2019
aad4306
Fix C99 standard for all targets
tyronerees Mar 15, 2019
0ceea69
Lapack compiling confined to subdirectory
tyronerees Mar 15, 2019
772576b
Constants + "Implicit None"
Mar 19, 2019
361e039
Remove trailing spaces
Mar 19, 2019
dd9578e
Public two_norm
Mar 20, 2019
5d7055d
Two new error constants
Mar 20, 2019
318b0e3
Implementation of New Print Level proposal
Mar 22, 2019
0016cd5
REMOVE TERMINAL COLOR CONTROLS CHARS
Mar 22, 2019
1281a33
Cosmetic changes to tests+examples
Mar 22, 2019
2f44c0a
Options handling (update)
Mar 22, 2019
3a299ff
Create src/ cmakelists.txt
tyronerees Mar 28, 2019
38b3dc8
Disable check for reg_order /= 0
talassio Mar 28, 2019
8772c3b
Update to options
Mar 29, 2019
887e095
Merge branch 'update_cmake' of https://github.com/ralna/RALFit
Apr 1, 2019
87db54a
Resolves requested changes #18
Apr 1, 2019
1b6f44f
RING FENCE for RAL_NLLS_DTRS_DOUBLE
Apr 1, 2019
9e61973
RING FENCE for RAL_NLLS_DTRS_DOUBLE
Apr 1, 2019
c42447a
Merge branch 'master' of https://github.com/talassio/RALFit
Apr 1, 2019
1c069cd
fix issue #22
Apr 2, 2019
7ae8109
Update printing coverage
Apr 2, 2019
9a65eb7
Update to DOCs
Apr 2, 2019
2fdbe9b
Increase coverage of print levels 4 & 5
Apr 2, 2019
ffeb26f
Block-if moved to logical-if statement
Apr 11, 2019
2ab4a40
Fix typos to docs
Apr 11, 2019
cb72c20
Update to Python C interface
Apr 11, 2019
046c28b
Python 3.x changes to documentation generator
Apr 11, 2019
091b3fd
Add test for error NLLS_ERROR_WRONG_INNER_METHOD
Apr 12, 2019
9f33fbc
dealloc status
Apr 23, 2019
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
Prev Previous commit
Next Next commit
Add test for error NLLS_ERROR_WRONG_INNER_METHOD
  • Loading branch information
Andrew Sajo committed Apr 12, 2019
commit 091b3fd49a80df7943a3be69d3edaa849c13177d
1 change: 1 addition & 0 deletions libRALFit/src/ral_nlls_workspaces.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,7 @@ recursive subroutine setup_workspace_calculate_step(n,m,w,options,inform,tenJ,in
call setup_workspace_solve_newton_tensor(n,m,&
w%solve_newton_tensor_ws,&
options, inform, tenJ, inner_workspace)
if (inform%status /= 0) goto 100
else
if ( options%type_of_method == 1) then
select case (options%nlls_method)
Expand Down
11 changes: 11 additions & 0 deletions libRALFit/test/nlls_test.f90
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,17 @@ program nlls_test
end if
status%status = 0

! test for unsupported inner_method
call reset_default_options(options)
options%model = 4
options%inner_method = 3125
call solve_basic(X,params,options,status)
if ( status%status .ne. NLLS_ERROR_WRONG_INNER_METHOD ) then
write(*,*) 'Error: wrong inner method passed and not caught'
no_errors_main = no_errors_main + 1
end if
status%status = 0

! test for unsupported method, with type_of_method = 2
call reset_default_options(options)
options%type_of_method = 2
Expand Down