Options renamed to Janus
This commit is contained in:
parent
42b4152a82
commit
917eaf7107
2
Makefile
2
Makefile
|
@ -2,7 +2,7 @@ SOURCES = $(wildcard src/*.cpp)
|
||||||
OBJECTS = $(SOURCES:%.cpp=%.o)
|
OBJECTS = $(SOURCES:%.cpp=%.o)
|
||||||
APPLICATION = arma-flow
|
APPLICATION = arma-flow
|
||||||
CXXFLAGS = -Wall -c -O2 -std=c++17 -o
|
CXXFLAGS = -Wall -c -O2 -std=c++17 -o
|
||||||
LDFLAGS = -larmadillo -loptions -lstdc++fs
|
LDFLAGS = -larmadillo -ljanus -lstdc++fs
|
||||||
|
|
||||||
all: ${OBJECTS} ${APPLICATION}
|
all: ${OBJECTS} ${APPLICATION}
|
||||||
|
|
||||||
|
|
22
README.md
22
README.md
|
@ -6,11 +6,25 @@ Additional support for three-phase short-circuit calculation.
|
||||||
|
|
||||||
## 1. Requirements
|
## 1. Requirements
|
||||||
|
|
||||||
* A newer version of [Armadillo](http://arma.sourceforge.net/)
|
* A newer version of [Armadillo](http://arma.sourceforge.net/).
|
||||||
* Tested on 8.400.0
|
* Tested on 8.400.0
|
||||||
* The [Options](https://mulholland.xyz/docs/options/) library
|
* The [Janus](https://github.com/dmulholland/janus-cpp) library.
|
||||||
* This library was recently renamed to Janus. In order to build correctly, you may need to modify some code.
|
* Compiler with C++17 support.
|
||||||
* Compiler with C++17 support
|
|
||||||
|
### 1.1 Build Janus
|
||||||
|
|
||||||
|
You need to build and install Janus before building arma-flow.
|
||||||
|
|
||||||
|
For example:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/dmulholland/janus-cpp.git
|
||||||
|
cd janus-cpp/src
|
||||||
|
g++ -std=c++11 -shared -fPIC -o libjanus.so janus.cpp
|
||||||
|
sudo cp libjanus.so /usr/lib
|
||||||
|
sudo cp janus.h /usr/include
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
## 2. Documentation
|
## 2. Documentation
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <complex>
|
#include <complex>
|
||||||
#include <options.h>
|
#include <janus.h>
|
||||||
|
|
||||||
namespace flow
|
namespace flow
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,7 @@ namespace flow
|
||||||
class args
|
class args
|
||||||
{
|
{
|
||||||
/// The argument parser.
|
/// The argument parser.
|
||||||
options::ArgParser arg_parser_;
|
janus::ArgParser arg_parser_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
|
|
Reference in New Issue