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.

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

Jump to bottom

fixed bug in detection of pathological cases in devPAV #92

Merged
merged 115 commits into from
Nov 8, 2023
Merged

fixed bug in detection of pathological cases in devPAV #92

merged 115 commits into from
Nov 8, 2023

Conversation

vergep
Copy link
Contributor

@vergep vergep commented Oct 15, 2023

  • made new detection of pathological cases
  • created output for pathological cases
  • adjusted tests

vergep and others added 30 commits September 14, 2023 10:02
@vergep
dummy file to initialize TLM branch
0f2d543
@vergep
nieuwe test
6ea6a44
@vergep
werkt dit?
bd09fdd
@vergep
test geschreven voor MSwithin
37c7416
@vergep
1. Creation of run.py, which contains main script used for debugging.
9deb3ed 
2. Script that calculates MSWithin + test script.
@vergep
removed some unused code in test_TLM.py
5725935
@vergep
added code for calculation and test of means_z
a2ea89c
@vergep
changed names of columns of covars df to more generic names
f956225
@vergep
removed 'z' from calc_means_z
6a29a8c
@vergep
code and test for kappa
1f826aa
@vergep
added some comments
b17b482
@vergep
work in progress to write function for T0
9cd21bd
@vergep
script and test for h^2 calculation
33cabd9
@vergep
added some comments
7064b1b
@vergep
script and test for T0
8d3a11f
@vergep
Merge branch 'h' into T0
21e0498 
# Conflicts:
#	lir/classifiers.py
#	tests/run.py
#	tests/test_TLM.py
@vergep
input data en R-output data added to git
4168c5f
@camillevandijk
Set up of calculations of U0 and UU for the predict part.
aa0401e
@vergep
calculation of U_h0 and U_hx
e8ebed5
@vergep
added intermediate 'predict' results from R
6810345
@camillevandijk
Added tests for U_h0 and U_hx.
6052cdf
@camillevandijk
Add calculations and test for U_hn. Plus transformed T0 to numpy inst…
a8dbec4 
…ead of pandas for consistency.
@camillevandijk
Update comments
ef05093
create branch
a2cb3be
add basic properties
77f9e4c
remove sklearn inheritance and replace predict_proba by transform
d650016
fix test
d981210
@vergep
changed some comment
66f3918
@vergep
added a model description
e3d9f94
@vergep
Merge branch 'predict_U' of https://github.com/NetherlandsForensicIns…
7bdd07d 
…titute/lir into predict_U
vergep and others added 24 commits October 31, 2023 16:10
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
250126e 
… (so with slope 1)
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
92139cb 
… (so with slope 1)
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
1ee6249 
… (so with slope 1)
@vergep
Merge remote-tracking branch 'origin/TLM' into TLM
11aa45c
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
6c109a7 
… (so with slope 1)
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
bfaeb8d 
… (so with slope 1)
@vergep
corrected surface calculation when PAV spline is parallel to line y=x…
f46e21a 
… (so with slope 1)
@vergep
corrected tests and removed tests for devpav_estimated and replaced b…
b0df56c 
…y tests for devpav
@vergep
some cosmetics and included error message when data under one of two …
f8b14c5 
…classes is missing
@vergep
some cosmetics and included error message when data under one of two …
836b667 
…classes is missing
@vergep
removed obsolete return brackets
dfe3e2c
@vergep
removed obsolete brackets
48e90a4
@vergep
made tests for _calcsurface working again
236c77c
@vergep
plot and test that shows that devpav_estimated gives a different resu…
bceee10 
…lt than devpav
@vergep
removed devpav_estimated
36bc837
@vergep
Merge branch 'TLM' into remove_devPAV_bug
57ffefb
@vergep
some cosmetics
88012dc
@vergep
Merge remote-tracking branch 'origin/remove_devPAV_bug' into remove_d…
d8c584b 
…evPAV_bug
@vergep
changed is.nan test
99122bb
@vergep
changed test accuracy of test_fit_and_transform to 9 decimals instead…
fe81d4d 
… of 10.
@vergep
deleted all files related to TLM
8b4bd07
@wowtor
replace nose by pytest
ded127e
@wowtor
Merge branch 'tests_import' into remove_devPAV_bug
226e95f
@wowtor
removed nose dependency
c871d40
wowtor
wowtor approved these changes Nov 8, 2023
View reviewed changes
Copy link
Contributor

@wowtor wowtor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nog een paar suggestions

lir/metrics.py Outdated Show resolved Hide resolved
lir/metrics.py Outdated Show resolved Hide resolved
lir/metrics.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
@wowtor wowtor merged commit 732266e into master Nov 8, 2023
1 check passed
wowtor added a commit that referenced this pull request Nov 8, 2023
@vergep @camillevandijk @wowtor
fixed bug in detection of pathological cases in devPAV (#92)
b6f01e6 
- made new detection of pathological cases
- created output for pathological cases
- adjusted tests

---------

Co-authored-by: Camille van Dijk <c.van.dijk@nfi.nl>
Co-authored-by: Kim de Bie (DBS) <kim@7zj9vz2-l.holmes.nl>
Co-authored-by: camillevandijk <144999965+camillevandijk@users.noreply.github.com>
Co-authored-by: wb <20113294+wowtor@users.noreply.github.com>
@wowtor wowtor deleted the remove_devPAV_bug branch November 9, 2023 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wowtor wowtor wowtor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vergep @wowtor @camillevandijk