Skip to content

Commit 380e6ea

Browse files
committed
Revert "tweaks: re grid"
This reverts commit 5d1a0fe.
1 parent 5d1a0fe commit 380e6ea

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

src/example.js

-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
import {find_beta_from_ci} from "./index.js"
22

3-
console.log(1)
43
let result1 = find_beta_from_ci({ci_lower: 0.3, ci_upper: 0.8})
54
console.log(result1)
65

7-
console.log(2)
86
let result2 = find_beta_from_ci({ci_lower: 0.3, ci_upper: 0.8, ci_length: 0.95})
97
console.log(result2)
108

11-
console.log(3)
129
let result3 = find_beta_from_ci({ci_lower: "0.3", ci_upper: "0.8", ci_length: "0.95"})
1310
console.log(result3)
14-
15-
console.log(4)
16-
let result4 = find_beta_from_ci({ci_lower: 1/10**5, ci_upper: 1/10**3, ci_length: 0.9})
17-
console.log(result3)

src/index.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,15 @@ export const find_beta_from_ci = ({ci_lower, ci_upper, ci_length}) => {
5353
return [df_da, df_db]
5454
}
5555

56-
// point at which to give up
57-
let target_loss = 10e-8
5856
// Try a sensible default
5957
console.log("Try an initial approximation")
6058
let x0_init = [ 50, 50 ]
6159
let nelderMead_init = nelderMead(loss, x0_init);
6260
let result_init = [nelderMead_init.x[0], nelderMead_init.x[1]]
6361
let loss_init = loss(result_init)
64-
console.log(`Initial loss: ${loss_init}`)
62+
// console.log(loss_init)
6563

66-
if(loss_init < target_loss){
64+
if(loss < 10e-8){
6765
return result_init
6866
}
6967

@@ -80,8 +78,7 @@ export const find_beta_from_ci = ({ci_lower, ci_upper, ci_length}) => {
8078
let new_result = [nelderMead_output.x[0], nelderMead_output.x[1]]
8179
let new_loss = loss(new_result)
8280

83-
if(new_loss < target_loss){
84-
console.log(new_loss)
81+
if(loss < 10e-8){
8582
return new_result
8683
}
8784

@@ -91,8 +88,7 @@ export const find_beta_from_ci = ({ci_lower, ci_upper, ci_length}) => {
9188
}
9289
}
9390
}
94-
console.log(`Initial grid loss: ${loss_init}`)
95-
if(min_loss < target_loss){
91+
if(loss < 10e-6){
9692
return result
9793
}
9894

@@ -106,8 +102,7 @@ export const find_beta_from_ci = ({ci_lower, ci_upper, ci_length}) => {
106102
let new_result = [nelderMead_output.x[0], nelderMead_output.x[1]]
107103
let new_loss = loss(new_result)
108104

109-
if(new_loss < target_loss){
110-
console.log(new_loss)
105+
if(loss < 10e-8){
111106
return new_result
112107
}
113108

0 commit comments

Comments
 (0)