Skip to content

Commit 0d548fc

Browse files
Logging for Kriging
Enhanced logging
1 parent d52608b commit 0d548fc

4 files changed

Lines changed: 138 additions & 60 deletions

File tree

notebooks/00_spotPython_tests.ipynb

Lines changed: 114 additions & 59 deletions
Large diffs are not rendered by default.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
77

88
[project]
99
name = "spotPython"
10-
version = "0.10.12"
10+
version = "0.10.13"
1111
authors = [
1212
{ name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
1313
]

src/spotPython/build/kriging.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,17 @@ def set_de_bounds(self) -> None:
255255
Returns:
256256
None
257257
"""
258+
logger.debug("In set_de_bounds(): self.min_theta: %s", self.min_theta)
259+
logger.debug("In set_de_bounds(): self.max_theta: %s", self.max_theta)
260+
logger.debug("In set_de_bounds(): self.n_theta: %s", self.n_theta)
261+
logger.debug("In set_de_bounds(): self.optim_p: %s", self.optim_p)
262+
logger.debug("In set_de_bounds(): self.min_p: %s", self.min_p)
263+
logger.debug("In set_de_bounds(): self.max_p: %s", self.max_p)
264+
logger.debug("In set_de_bounds(): self.n_p: %s", self.n_p)
265+
logger.debug("In set_de_bounds(): self.noise: %s", self.noise)
266+
logger.debug("In set_de_bounds(): self.min_Lambda: %s", self.min_Lambda)
267+
logger.debug("In set_de_bounds(): self.max_Lambda: %s", self.max_Lambda)
268+
258269
de_bounds = [[self.min_theta, self.max_theta] for _ in range(self.n_theta)]
259270
if self.optim_p:
260271
de_bounds += [[self.min_p, self.max_p] for _ in range(self.n_p)]
@@ -264,6 +275,7 @@ def set_de_bounds(self) -> None:
264275
if self.noise:
265276
de_bounds.append([self.min_Lambda, self.max_Lambda])
266277
self.de_bounds = de_bounds
278+
logger.debug("In set_de_bounds(): self.de_bounds: %s", self.de_bounds)
267279

268280
def extract_from_bounds(self, new_theta_p_Lambda: np.ndarray) -> None:
269281
"""
@@ -290,14 +302,19 @@ def extract_from_bounds(self, new_theta_p_Lambda: np.ndarray) -> None:
290302
Returns:
291303
None
292304
"""
305+
logger.debug("In extract_from_bounds(): new_theta_p_Lambda: %s", new_theta_p_Lambda)
293306
self.theta = new_theta_p_Lambda[:self.n_theta]
307+
logger.debug("In extract_from_bounds(): self.n_theta: %s", self.n_theta)
294308
if self.optim_p:
295309
self.p = new_theta_p_Lambda[self.n_theta:self.n_theta + self.n_p]
310+
logger.debug("In extract_from_bounds(): self.p: %s", self.p)
296311
if self.noise:
297312
self.Lambda = new_theta_p_Lambda[self.n_theta + self.n_p]
313+
logger.debug("In extract_from_bounds(): self.Lambda: %s", self.Lambda)
298314
else:
299315
if self.noise:
300316
self.Lambda = new_theta_p_Lambda[self.n_theta]
317+
logger.debug("In extract_from_bounds(): self.Lambda: %s", self.Lambda)
301318

302319
def optimize_model(self) -> Union[List[float], Tuple[float]]:
303320
"""
@@ -332,6 +349,7 @@ def optimize_model(self) -> Union[List[float], Tuple[float]]:
332349
result["x"] (Union[List[float], Tuple[float]]):
333350
A list or tuple of optimized parameter values.
334351
"""
352+
logger.debug("In optimize_model(): self.de_bounds passed to optimizer: %s", self.de_bounds)
335353
if self.model_optimizer.__name__ == 'dual_annealing':
336354
result = self.model_optimizer(func=self.fun_likelihood,
337355
bounds=self.de_bounds)
@@ -353,6 +371,8 @@ def optimize_model(self) -> Union[List[float], Tuple[float]]:
353371
x0=mean(self.de_bounds, axis=1))
354372
else:
355373
result = self.model_optimizer(func=self.fun_likelihood, bounds=self.de_bounds)
374+
logger.debug("In optimize_model(): result: %s", result)
375+
logger.debug('In optimize_model(): returned result["x"]: %s', result["x"])
356376
return result["x"]
357377

358378
def update_log(self) -> None:
@@ -896,6 +916,7 @@ def build_Psi(self) -> None:
896916
except LinAlgError as err:
897917
print(f"Building Psi failed:\n {self.Psi}. {err=}, {type(err)=}")
898918
if self.noise:
919+
logger.debug("In build_Psi(): self.Lambda: %s", self.Lambda)
899920
self.Psi[diag_indices_from(self.Psi)] += self.Lambda
900921
else:
901922
self.Psi[diag_indices_from(self.Psi)] += self.eps

src/spotPython/utils/init.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ def design_control_init(init_size=10, repeats=1) -> dict:
355355

356356

357357
def surrogate_control_init(
358+
log_level: int = 50,
358359
noise=False,
359360
model_optimizer=differential_evolution,
360361
model_fun_evals=10000,
@@ -436,6 +437,7 @@ def surrogate_control_init(
436437
437438
"""
438439
surrogate_control = {
440+
"log_level": log_level,
439441
"noise": noise,
440442
"model_optimizer": model_optimizer,
441443
"model_fun_evals": model_fun_evals,

0 commit comments

Comments
 (0)