Skip to content

Ajout de la méthode linéaire tronquée #20

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

Open
tdelc wants to merge 4 commits into
base: master
Choose a base branch
from
+21 −6
Open

Ajout de la méthode linéaire tronquée #20

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b01af1
Add truncated method to calibration functions
tdelc Jan 8, 2026
28c9c82
Enable truncated method
tdelc Apr 16, 2026
4b8c8cd
Merge branch 'master' of https://github.com/tdelc/icarus
tdelc Apr 16, 2026
b703be0
Return to official icarus package
tdelc Apr 16, 2026
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
27 changes: 21 additions & 6 deletions R/calib.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ calib <- function(Xs, d, total, q=NULL, method=NULL, bounds = NULL,
params <- bounds
updateParameters <- identity
},
# truncated={
# inverseDistance <- inverseDistanceTruncated
# params <- bounds
# updateParameters <- identity
# },
truncated={
inverseDistance <- inverseDistanceTruncated
params <- bounds
updateParameters <- identity
},
# curlingHat={
# inverseDistance <- distanceCurlingHat
# # TODO : check params in list are correctly entered
Expand Down Expand Up @@ -155,5 +155,20 @@ inverseDistanceLogit <- function(x, bounds) {
}

# TODO : hyperbolic sine
# TODO : maybe truncated method ?

# truncated method
inverseDistanceTruncated <- function(x, bounds) {

if(length(bounds) != 2) {
stop("Must enter LO and UP bounds in a vector.
Example : bounds=c(0.5,1.5) for LO = 0.5 and UP=1.5")
}

L = bounds[1]
U = bounds[2]
som = 1+x
distance=pmax(L,som)+pmin(U,som)-som
fprim=as.numeric((distance>L)*(distance<U))
return(list(distance,fprim))

}