Skip to content

Commit 4cb74d3

Browse files
committed
rename project from lmi to corr-solver
1 parent dde10f5 commit 4cb74d3

File tree

11 files changed

+38
-38
lines changed

11 files changed

+38
-38
lines changed

.github/workflows/install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ jobs:
4949
run: cmake --build build --config Debug -j4
5050

5151
- name: run
52-
run: ./build/test_installed/Lmi
52+
run: ./build/test_installed/CorrSolver

.github/workflows/standalone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
run: cmake --build build -j4
4343

4444
- name: run
45-
run: ./build/standalone/Lmi
45+
run: ./build/standalone/CorrSolver

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ option(INSTALL_ONLY "Enable for installation only" OFF)
99

1010
# Note: update this to your new project's name and version
1111
project(
12-
Lmi
12+
CorrSolver
1313
VERSION 1.0
1414
LANGUAGES CXX
1515
)

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[![Actions Status](https://github.com/luk036/lmi-cpp/workflows/MacOS/badge.svg)](https://github.com/luk036/lmi-cpp/actions)
2-
[![Actions Status](https://github.com/luk036/lmi-cpp/workflows/Windows/badge.svg)](https://github.com/luk036/lmi-cpp/actions)
3-
[![Actions Status](https://github.com/luk036/lmi-cpp/workflows/Ubuntu/badge.svg)](https://github.com/luk036/lmi-cpp/actions)
4-
[![Actions Status](https://github.com/luk036/lmi-cpp/workflows/Style/badge.svg)](https://github.com/luk036/lmi-cpp/actions)
5-
[![Actions Status](https://github.com/luk036/lmi-cpp/workflows/Install/badge.svg)](https://github.com/luk036/lmi-cpp/actions)
6-
[![codecov](https://codecov.io/gh/luk036/lmi-cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/luk036/lmi-cpp)
1+
[![Actions Status](https://github.com/luk036/corr-solver-cpp/workflows/MacOS/badge.svg)](https://github.com/luk036/corr-solver-cpp/actions)
2+
[![Actions Status](https://github.com/luk036/corr-solver-cpp/workflows/Windows/badge.svg)](https://github.com/luk036/corr-solver-cpp/actions)
3+
[![Actions Status](https://github.com/luk036/corr-solver-cpp/workflows/Ubuntu/badge.svg)](https://github.com/luk036/corr-solver-cpp/actions)
4+
[![Actions Status](https://github.com/luk036/corr-solver-cpp/workflows/Style/badge.svg)](https://github.com/luk036/corr-solver-cpp/actions)
5+
[![Actions Status](https://github.com/luk036/corr-solver-cpp/workflows/Install/badge.svg)](https://github.com/luk036/corr-solver-cpp/actions)
6+
[![codecov](https://codecov.io/gh/luk036/corr-solver-cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/luk036/corr-solver-cpp)
77

88
<p align="center">
99
<img src="https://repository-images.githubusercontent.com/254842585/4dfa7580-7ffb-11ea-99d0-46b8fe2f4170" height="175" width="auto" />
@@ -35,9 +35,9 @@ Linear Matrix Inequalities for modern C++
3535
### Adjust the template to your needs
3636

3737
- Use this repo [as a template](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-from-a-template).
38-
- Replace all occurrences of "Lmi" in the relevant CMakeLists.txt with the name of your project
39-
- Capitalization matters here: `Lmi` means the name of the project, while `lmi` is used in file names.
40-
- Remember to rename the `include/lmi` directory to use your project's lowercase name and update all relevant `#include`s accordingly.
38+
- Replace all occurrences of "CorrSolver" in the relevant CMakeLists.txt with the name of your project
39+
- Capitalization matters here: `CorrSolver` means the name of the project, while `lmi` is used in file names.
40+
- Remember to rename the `include/corrsolver` directory to use your project's lowercase name and update all relevant `#include`s accordingly.
4141
- Replace the source files with your own
4242
- For header-only libraries: see the comments in [CMakeLists.txt](CMakeLists.txt)
4343
- Add [your project's codecov token](https://docs.codecov.io/docs/quick-start) to your project's github secrets under `CODECOV_TOKEN`
@@ -56,7 +56,7 @@ Use the following command to build and run the executable target.
5656
```bash
5757
cmake -S. -B build
5858
cmake --build build
59-
./build/standalone/Lmi --help
59+
./build/standalone/CorrSolver --help
6060
```
6161

6262
### Build and run test suite
@@ -70,7 +70,7 @@ cd build/test
7070
CTEST_OUTPUT_ON_FAILURE=1 ctest
7171

7272
# or maybe simply call the executable:
73-
./build/test/LmiTests
73+
./build/test/CorrSolverTests
7474
```
7575

7676
To collect code coverage information, run CMake with the `-DENABLE_TEST_COVERAGE=1` option.
@@ -94,7 +94,7 @@ See [Format.cmake](https://github.com/TheLartians/Format.cmake) for details.
9494

9595
### Build the documentation
9696

97-
The documentation is automatically built and [published](https://luk036.github.io/lmi-cpp) whenever a [GitHub Release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository) is created.
97+
The documentation is automatically built and [published](https://luk036.github.io/corr-solver-cpp) whenever a [GitHub Release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository) is created.
9898
To manually build documentation, call the following command.
9999

100100
```bash

source/Qmi_oracle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <cassert>
2-
#include <lmi/qmi_oracle.hpp>
2+
#include <lmi/Qmi_oracle.hpp>
33
#include <xtensor-blas/xlinalg.hpp>
44

55
#define ROW(X, index) xt::view(X, index, xt::all())
@@ -14,7 +14,7 @@ using Cut = std::tuple<Arr, double>;
1414
* @param[in] x
1515
* @return std::optional<Cut>
1616
*/
17-
std::optional<Cut> qmi_oracle::operator()(const Arr& x) {
17+
std::optional<Cut> Qmi_oracle::operator()(const Arr& x) {
1818
using xt::linalg::dot;
1919

2020
this->_count = 0;

source/greeter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include <fmt/format.h>
2-
#include <lmi/greeter.h>
2+
#include <corrsolver/greeter.h>
33

44
using namespace lmi;
55

6-
Lmi::Lmi(std::string _name) : name(std::move(_name)) {}
6+
CorrSolver::CorrSolver(std::string _name) : name(std::move(_name)) {}
77

8-
std::string Lmi::greet(LanguageCode lang) const {
8+
std::string CorrSolver::greet(LanguageCode lang) const {
99
switch (lang) {
1010
default:
1111
case LanguageCode::EN:

source/lsq_corr_ell.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include <ellalgo/cutting_plane.hpp>
33
#include <ellalgo/ell.hpp>
44
#include <ellalgo/utility.hpp>
5-
#include <lmi/lmi0_oracle.hpp>
6-
#include <lmi/lmi_oracle.hpp>
7-
#include <lmi/qmi_oracle.hpp>
5+
#include <ellalgo/oracles/lmi0_oracle.hpp>
6+
#include <ellalgo/oracles/lmi_oracle.hpp>
7+
#include <lmi/Qmi_oracle.hpp>
88
// #include <iostream>
99
#include <limits>
1010
#include <tuple>
@@ -132,7 +132,7 @@ class lsq_oracle {
132132
using Cut = std::tuple<Arr, double>;
133133

134134
private:
135-
qmi_oracle _qmi;
135+
Qmi_oracle _qmi;
136136
lmi0_oracle _lmi0;
137137

138138
public:
@@ -343,7 +343,7 @@ std::tuple<Arr, size_t, bool> lsq_corr_poly(const Arr& Y, const Arr& s, size_t m
343343
auto Sig = construct_poly_matrix(s, m);
344344
// P = mtx_norm_oracle(Sig, Y, a)
345345
auto a = zeros({m});
346-
auto Q = qmi_oracle(Sig, Y);
346+
auto Q = Qmi_oracle(Sig, Y);
347347
auto E = ell(10., a);
348348
auto P = bsearch_adaptor<decltype(Q), decltype(E)>(Q, E);
349349
// double normY = xt::norm_l2(Y);

specific.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ endif(xtensor-blas_ADDED)
4747

4848
CPMAddPackage(
4949
NAME EllAlgo
50-
GIT_TAG 1.0.3
50+
GIT_TAG 1.0.4
5151
GITHUB_REPOSITORY luk036/ellalgo-cpp
5252
OPTIONS "INSTALL_ONLY YES" # create an installable target
5353
)

standalone/source/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <lmi/greeter.h>
2-
#include <lmi/version.h>
1+
#include <corrsolver/greeter.h>
2+
#include <corrsolver/version.h>
33

44
#include <cxxopts.hpp>
55
#include <iostream>
@@ -36,7 +36,7 @@ auto main(int argc, char** argv) -> int {
3636
}
3737

3838
if (result["version"].as<bool>()) {
39-
std::cout << "Lmi, version " << LMI_VERSION << std::endl;
39+
std::cout << "CorrSolver, version " << CORRSOLVER_VERSION << std::endl;
4040
return 0;
4141
}
4242

@@ -46,7 +46,7 @@ auto main(int argc, char** argv) -> int {
4646
return 1;
4747
}
4848

49-
// lmi::Lmi lmi(name);
49+
// lmi::CorrSolver lmi(name);
5050
// std::cout << lmi.greet(langIt->second) << std::endl;
5151

5252
return 0;

test/source/greeter.old

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#include <doctest/doctest.h>
2-
#include <lmi/greeter.h>
3-
#include <lmi/version.h>
2+
#include <corrsolver/greeter.h>
3+
#include <corrsolver/version.h>
44

55
#include <string>
66

7-
// TEST_CASE("Lmi") {
7+
// TEST_CASE("CorrSolver") {
88
// using namespace lmi;
99

10-
// Lmi lmi("Tests");
10+
// CorrSolver lmi("Tests");
1111

1212
// CHECK(lmi.greet(LanguageCode::EN) == "Hello, Tests!");
1313
// CHECK(lmi.greet(LanguageCode::DE) == "Hallo Tests!");
1414
// CHECK(lmi.greet(LanguageCode::ES) == "¡Hola Tests!");
1515
// CHECK(lmi.greet(LanguageCode::FR) == "Bonjour Tests!");
1616
// }
1717

18-
TEST_CASE("Lmi version") {
19-
static_assert(std::string_view(LMI_VERSION) == std::string_view("1.0"));
20-
CHECK(std::string(LMI_VERSION) == std::string("1.0"));
18+
TEST_CASE("CorrSolver version") {
19+
static_assert(std::string_view(CORRSOLVER_VERSION) == std::string_view("1.0"));
20+
CHECK(std::string(CORRSOLVER_VERSION) == std::string("1.0"));
2121
}

0 commit comments

Comments
 (0)