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
17 changes: 7 additions & 10 deletions docs/manifold_sampling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@ Python

:math:`\hfun` Functions
^^^^^^^^^^^^^^^^^^^^^^^
.. todo::

* The set of functions available in |matlab| and Python are **not**
equal.

The following :math:`\hfun` functions are available for use with both the Python
and |matlab| implementations of Manifold Sampling. While they are presented
through their integration into the Python package, the documentation is valid
for the |matlab| version of these functions, which are located in
``manifold_sampling/m/general_nonsmooth_h_funs``.
The following :math:`\hfun` functions are available for use with the Python
implementation of Manifold Sampling. With the potential exception of
application-specific functions, these same functions are available for use with
the |matlab| implementation in ``manifold_sampling/m/general_nonsmooth_h_funs``.
While they are presented here through their integration into the Python package,
the documentation is generally valid for the |matlab| version of these
functions as well.

.. todo::

Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions manifold_sampling/m/tests/benchmark_manifold_sampling.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
jj = 1;
hfuns_all = {@h_censored_L1_loss, ...
@h_max_plus_quadratic_violation_penalty, ...
@h_piecewise_quadratic, @h_piecewise_quadratic_1, ...
@h_piecewise_quadratic, ...
@h_pw_maximum, @h_pw_maximum_squared, ...
@h_pw_minimum, @h_pw_minimum_squared, ...
@h_quantile, ...
Expand All @@ -69,7 +69,7 @@
hfun = hfuns{1};
nf_max = 100;
if row == 1
if jj == 1 || jj == 7
if jj == 1 || jj == 6
nf_max = 400; % Increasing nf_max for a few tests helps cover parts of manifold_sampling_primal
end
end
Expand Down