Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
alpha-mind
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dr.李
alpha-mind
Commits
e0302605
Commit
e0302605
authored
Dec 18, 2017
by
Dr.李
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update linux libs
parent
bcf2a1f1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
lpoptimizer.hpp
libs/include/linux/pfopt/lpoptimizer.hpp
+4
-3
meanvariance.hpp
libs/include/linux/pfopt/meanvariance.hpp
+4
-2
mvoptimizer.hpp
libs/include/linux/pfopt/mvoptimizer.hpp
+1
-1
libpfopt.so
libs/lib/linux/libpfopt.so
+0
-0
No files found.
libs/include/linux/pfopt/lpoptimizer.hpp
View file @
e0302605
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
#define pfopt_linear_programming_optimizer_hpp
#define pfopt_linear_programming_optimizer_hpp
#include "types.hpp"
#include "types.hpp"
#include <vector>
#include "ClpSimplex.hpp"
#include "ClpSimplex.hpp"
namespace
pfopt
{
namespace
pfopt
{
...
@@ -16,14 +15,16 @@ namespace pfopt {
...
@@ -16,14 +15,16 @@ namespace pfopt {
double
*
upperBound
,
double
*
upperBound
,
double
*
objective
);
double
*
objective
);
std
::
vector
<
double
>
xValue
()
const
{
return
sol_
;
}
~
LpOptimizer
()
{
delete
[]
sol_
;}
double
*
xValue
()
const
{
return
sol_
;
}
double
feval
()
const
;
double
feval
()
const
;
int
status
()
const
{
return
model_
.
status
();
}
int
status
()
const
{
return
model_
.
status
();
}
private
:
private
:
ClpSimplex
model_
;
ClpSimplex
model_
;
size_t
numberOfProb_
;
size_t
numberOfProb_
;
std
::
vector
<
double
>
sol_
;
double
*
sol_
;
};
};
}
}
...
...
libs/include/linux/pfopt/meanvariance.hpp
View file @
e0302605
...
@@ -22,6 +22,8 @@ namespace pfopt {
...
@@ -22,6 +22,8 @@ namespace pfopt {
double
*
varMatrix
,
double
*
varMatrix
,
double
riskAversion
=
1.
);
double
riskAversion
=
1.
);
virtual
~
MeanVariance
()
{
delete
[]
x_
;}
bool
setBoundedConstraint
(
const
double
*
lb
,
const
double
*
ub
);
bool
setBoundedConstraint
(
const
double
*
lb
,
const
double
*
ub
);
bool
setLinearConstrains
(
int
numCons
,
const
double
*
consMatrix
,
const
double
*
clb
,
const
double
*
cub
);
bool
setLinearConstrains
(
int
numCons
,
const
double
*
consMatrix
,
const
double
*
clb
,
const
double
*
cub
);
...
@@ -54,7 +56,7 @@ namespace pfopt {
...
@@ -54,7 +56,7 @@ namespace pfopt {
IpoptCalculatedQuantities
*
ip_cq
);
IpoptCalculatedQuantities
*
ip_cq
);
double
feval
()
const
{
return
feval_
;
}
double
feval
()
const
{
return
feval_
;
}
std
::
vector
<
double
>
xValue
()
const
{
return
x_
;
}
double
*
xValue
()
const
{
return
x_
;
}
private
:
private
:
VectorXd
expectReturn_
;
VectorXd
expectReturn_
;
...
@@ -68,7 +70,7 @@ namespace pfopt {
...
@@ -68,7 +70,7 @@ namespace pfopt {
const
double
*
ub_
;
const
double
*
ub_
;
VectorXd
grad_f_
;
VectorXd
grad_f_
;
double
feval_
;
double
feval_
;
std
::
vector
<
double
>
x_
;
double
*
x_
;
std
::
vector
<
Index
>
iRow_
;
std
::
vector
<
Index
>
iRow_
;
std
::
vector
<
Index
>
jCol_
;
std
::
vector
<
Index
>
jCol_
;
std
::
vector
<
double
>
g_grad_values_
;
std
::
vector
<
double
>
g_grad_values_
;
...
...
libs/include/linux/pfopt/mvoptimizer.hpp
View file @
e0302605
...
@@ -18,7 +18,7 @@ namespace pfopt {
...
@@ -18,7 +18,7 @@ namespace pfopt {
double
*
cub
=
nullptr
,
double
*
cub
=
nullptr
,
double
riskAversion
=
1.
);
double
riskAversion
=
1.
);
std
::
vector
<
double
>
xValue
()
const
{
return
mvImpl_
->
xValue
();
}
double
*
xValue
()
const
{
return
mvImpl_
->
xValue
();
}
double
feval
()
const
{
return
mvImpl_
->
feval
();
}
double
feval
()
const
{
return
mvImpl_
->
feval
();
}
...
...
libs/lib/linux/libpfopt.so
View file @
e0302605
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment