Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/macos-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
- name: install-test-dependencies
run: |
pip install matplotlib pillow seaborn scipy
brew tap homebrew/cask-fonts && brew install font-linux-biolinum
- name: test
run: |
python ./python-examples/bayesian-optimization.py
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ubuntu-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- name: install-test-dependencies
run: |
pip install matplotlib pillow seaborn scipy
sudo apt-get install fonts-linuxlibertine
- name: test
run: |
python ./python-examples/bayesian-optimization.py
Expand Down
5 changes: 3 additions & 2 deletions examples/gaussian-process-regression/main.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#include <Eigen/Core>
#include <cmath>
#include <cassert>
#include <fstream>
#include <iostream>
#include <mathtoolbox/gaussian-process-regression.hpp>
#include <random>
#include <string>
#include <timer.hpp>
#include <vector>
#include <timer.hpp>
#include <mathtoolbox/gaussian-process-regression.hpp>

using Eigen::MatrixXd;
using Eigen::VectorXd;
Expand Down
1 change: 1 addition & 0 deletions examples/log-determinant/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <Eigen/Core>
#include <Eigen/LU>
#include <cmath>
#include <cassert>
#include <iostream>
#include <mathtoolbox/log-determinant.hpp>

Expand Down
2 changes: 1 addition & 1 deletion external/optimization-test-functions
2 changes: 1 addition & 1 deletion external/pybind11
Submodule pybind11 updated 278 files
2 changes: 1 addition & 1 deletion external/timer
Submodule timer updated 1 files
+1 −1 CMakeLists.txt
3 changes: 2 additions & 1 deletion include/mathtoolbox/backtracking-line-search.hpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#ifndef MATHTOOLBOX_BACKTRACKING_LINE_SEARCH_HPP
#define MATHTOOLBOX_BACKTRACKING_LINE_SEARCH_HPP

#include <Eigen/Core>
#include <cassert>
#include <functional>
#include <iostream>
#include <Eigen/Core>

namespace mathtoolbox
{
Expand Down
3 changes: 2 additions & 1 deletion include/mathtoolbox/rbf-interpolation.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#ifndef MATHTOOLBOX_RBF_INTERPOLATION_HPP
#define MATHTOOLBOX_RBF_INTERPOLATION_HPP

#include <Eigen/Core>
#include <cassert>
#include <cmath>
#include <functional>
#include <memory>
#include <vector>
#include <Eigen/Core>

namespace mathtoolbox
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef MATHTOOLBOX_STRONG_WOLFE_CONDITIONS_LINE_SEARCH_HPP
#define MATHTOOLBOX_STRONG_WOLFE_CONDITIONS_LINE_SEARCH_HPP

#include <Eigen/Core>
#include <cassert>
#include <functional>
#include <iostream>
#include <Eigen/Core>

#define MATHTOOLBOX_VERBOSE_LINE_SEARCH_WARNINGS

Expand Down
3 changes: 1 addition & 2 deletions python-examples/bayesian-optimization.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def objective_func(x: np.ndarray) -> float:
# Set up the plot design
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

for i in range(NUM_ITERS):
# Proceed the optimization step
Expand All @@ -61,7 +60,7 @@ def objective_func(x: np.ndarray) -> float:
# Prepare a figure object
fig = plt.figure(figsize=FIG_SIZE, dpi=DPI, constrained_layout=True)
grid_spec = fig.add_gridspec(3, 1)
fig.suptitle("Bayesian Optimization [#iterations = {:02}]".format(i + 1))
fig.suptitle("Bayesian Optimization [#iter = {:02}]".format(i + 1))

# Begin to draw the top plot
ax = fig.add_subplot(grid_spec[0:2, 0])
Expand Down
1 change: 0 additions & 1 deletion python-examples/classical-mds-image.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
# Set style
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Draw plot
fig = plt.figure(figsize=FIG_SIZE, dpi=DPI)
Expand Down
1 change: 0 additions & 1 deletion python-examples/rbf-interpolation-comparison.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ def objective_func(x: np.ndarray) -> float:
# Set up the plot design
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Prepare a figure object
fig = plt.figure(figsize=FIG_SIZE, dpi=DPI)
Expand Down
2 changes: 0 additions & 2 deletions python-examples/rbf-interpolation-exact.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pymathtoolbox
import numpy as np
import random
import math
import matplotlib.pyplot as plt
import seaborn as sns
Expand Down Expand Up @@ -40,7 +39,6 @@ def objective_func(x: np.ndarray) -> float:
# Set up the plot design
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Calculate sequences of interpolated values
x_samples = np.arange(0.0, 1.0, 0.001)
Expand Down
3 changes: 0 additions & 3 deletions python-examples/rbf-interpolation-polynomial.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import pymathtoolbox
import numpy as np
import random
import math
import matplotlib.pyplot as plt
import seaborn as sns

Expand All @@ -18,7 +16,6 @@
# Set up the plot design
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Prepare a figure object
fig = plt.figure(figsize=FIG_SIZE, dpi=DPI)
Expand Down
1 change: 0 additions & 1 deletion python-examples/rbf-interpolation.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ def objective_func(x: np.ndarray) -> float:
# Set up the plot design
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Calculate sequences of interpolated values
x_samples = np.arange(0.0, 1.0, 0.001)
Expand Down
1 change: 0 additions & 1 deletion python-examples/som-image-1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# Set plot style
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Load an image
asset_dir_path = os.path.dirname(os.path.abspath(__file__)) + "/assets"
Expand Down
1 change: 0 additions & 1 deletion python-examples/som-image.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
# Set plot style
sns.set()
sns.set_context()
plt.rcParams['font.sans-serif'] = ["Linux Biolinum O", "Linux Biolinum"]

# Load an image
asset_dir_path = os.path.dirname(os.path.abspath(__file__)) + "/assets"
Expand Down
1 change: 1 addition & 0 deletions src/acquisition-functions.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <cmath>
#include <cassert>
#include <mathtoolbox/acquisition-functions.hpp>
#include <mathtoolbox/probability-distributions.hpp>

Expand Down
3 changes: 2 additions & 1 deletion src/bayesian-optimization.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#include <cassert>
#include <algorithm>
#include <iostream>
#include <limits>
#include <vector>
#include <mathtoolbox/acquisition-functions.hpp>
#include <mathtoolbox/bayesian-optimization.hpp>
#include <mathtoolbox/gaussian-process-regression.hpp>
#include <mathtoolbox/gradient-descent.hpp>
#include <vector>

using Eigen::MatrixXd;
using Eigen::VectorXd;
Expand Down
3 changes: 2 additions & 1 deletion src/gaussian-process-regression.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#include <cassert>
#include <iostream>
#include <tuple>
#include <mathtoolbox/constants.hpp>
#include <mathtoolbox/gaussian-process-regression.hpp>
#include <mathtoolbox/kernel-functions.hpp>
#include <mathtoolbox/log-determinant.hpp>
#include <mathtoolbox/numerical-optimization.hpp>
#include <tuple>

using Eigen::MatrixXd;
using Eigen::VectorXd;
Expand Down
1 change: 1 addition & 0 deletions src/kernel-functions.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <cmath>
#include <cassert>
#include <mathtoolbox/kernel-functions.hpp>

using Eigen::VectorXd;
Expand Down
1 change: 1 addition & 0 deletions src/matrix-inversion.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cassert>
#include <Eigen/LU>
#include <mathtoolbox/matrix-inversion.hpp>

Expand Down
1 change: 1 addition & 0 deletions src/probability-distributions.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cassert>
#include <cmath>
#include <mathtoolbox/constants.hpp>
#include <mathtoolbox/probability-distributions.hpp>
Expand Down
1 change: 1 addition & 0 deletions src/rbf-interpolation.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <Eigen/LU>
#include <cassert>
#include <cmath>
#include <mathtoolbox/rbf-interpolation.hpp>

Expand Down
1 change: 1 addition & 0 deletions src/som.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <cassert>
#include <Eigen/SparseCore>
#include <mathtoolbox/data-normalization.hpp>
#include <mathtoolbox/som.hpp>
Expand Down
Loading