Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
alta
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alta
alta
Commits
249c995f
Commit
249c995f
authored
Sep 17, 2013
by
Laurent Belcour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing the clustering. Should be handled by a command line argument.
parent
13c628a9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
13 deletions
+19
-13
sources/core/clustering.cpp
sources/core/clustering.cpp
+2
-1
sources/core/data.h
sources/core/data.h
+12
-12
sources/plugins/nonlinear_function_retroblinn/function.cpp
sources/plugins/nonlinear_function_retroblinn/function.cpp
+5
-0
No files found.
sources/core/clustering.cpp
View file @
249c995f
...
...
@@ -24,7 +24,7 @@ template<class T> void clustering(const T* in_data, int _nY, params::input in_pa
// Fill the input part of the vector
params
::
convert
(
&
p
[
0
],
in_param
,
out_param
,
&
e
[
0
]);
/*
// Search for duplicates only when the reparametrization is compressing
// the space.
if(out_nX < in_nX)
...
...
@@ -59,6 +59,7 @@ template<class T> void clustering(const T* in_data, int _nY, params::input in_pa
}
}
else
*/
{
// Fill the output part of the vector
for
(
int
j
=
0
;
j
<
_nY
;
++
j
)
...
...
sources/core/data.h
View file @
249c995f
...
...
@@ -108,7 +108,7 @@ class data_params : public data
//! \brief contructor requires the definition of a base class that
//! has a parametrization, and a new parametrization.
data_params
(
const
data
*
d
,
params
::
input
new_param
,
data_params
::
clustrering
method
=
data_params
::
NONE
)
:
data_params
::
clustrering
method
=
data_params
::
NONE
)
:
_clustering_method
(
method
)
{
setParametrization
(
new_param
);
...
...
@@ -128,10 +128,10 @@ class data_params : public data
{
NOT_IMPLEMENTED
();
}
virtual
vec
value
(
vec
in
)
const
{
NOT_IMPLEMENTED
();
}
virtual
vec
value
(
vec
in
)
const
{
NOT_IMPLEMENTED
();
}
// Load data from a file
virtual
void
load
(
const
std
::
string
&
filename
)
...
...
@@ -149,13 +149,13 @@ class data_params : public data
// Acces to data
virtual
vec
get
(
int
i
)
const
{
return
_data
[
i
];
return
_data
[
i
];
}
virtual
vec
operator
[](
int
i
)
const
{
return
this
->
get
(
i
);
}
//! \todo This should crash at execution.
virtual
void
set
(
vec
x
)
{
...
...
@@ -165,24 +165,24 @@ class data_params : public data
// Get data size, e.g. the number of samples to fit
virtual
int
size
()
const
{
return
_data
.
size
();
return
_data
.
size
();
}
// Get min and max input space values
virtual
vec
min
()
const
{
return
_min
;
return
_min
;
}
virtual
vec
max
()
const
{
return
_max
;
return
_max
;
}
protected:
// data
data_params
::
clustrering
_clustering_method
;
std
::
vector
<
vec
>
_data
;
std
::
vector
<
vec
>
_data
;
vec
_min
,
_max
;
vec
_min
,
_max
;
};
sources/plugins/nonlinear_function_retroblinn/function.cpp
View file @
249c995f
...
...
@@ -118,6 +118,11 @@ vec retroblinn_function::parametersJacobian(const vec& x) const
void
retroblinn_function
::
bootstrap
(
const
data
*
d
,
const
arguments
&
args
)
{
for
(
int
i
=
0
;
i
<
dimY
();
++
i
)
{
_ks
[
i
]
=
1.0
;
_N
[
i
]
=
1.0
;
}
}
void
retroblinn_function
::
save_call
(
std
::
ostream
&
out
,
...
...
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