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
aa1042fa
Commit
aa1042fa
authored
Jan 11, 2014
by
Laurent Belcour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating the data2data soft
parent
969d2280
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
sources/core/plugins_manager.cpp
sources/core/plugins_manager.cpp
+4
-1
sources/plugins/nonlinear_function_blinn/function.h
sources/plugins/nonlinear_function_blinn/function.h
+1
-7
sources/softs/data2data/main.cpp
sources/softs/data2data/main.cpp
+8
-3
No files found.
sources/core/plugins_manager.cpp
View file @
aa1042fa
...
...
@@ -263,7 +263,10 @@ function* plugins_manager::get_function(const std::string& filename)
function
*
f
=
get_function
(
args
);
f
->
setDimX
(
nX
);
f
->
setDimY
(
nY
);
f
->
setParametrization
(
param_in
);
if
(
f
->
input_parametrization
()
==
params
::
UNKNOWN_INPUT
)
{
f
->
setParametrization
(
param_in
);
}
f
->
setParametrization
(
param_out
);
// Load the function part from the file object
...
...
sources/plugins/nonlinear_function_blinn/function.h
View file @
aa1042fa
...
...
@@ -68,13 +68,7 @@ class blinn_function : public nonlinear_function
virtual
params
::
input
input_parametrization
()
const
{
return
params
::
COS_TH
;
}
virtual
void
setParametrization
(
params
::
input
new_param
)
{
std
::
cerr
<<
"Cannot change the ouput parametrization "
<<
__FILE__
<<
":"
<<
__LINE__
<<
std
::
endl
;
throw
;
}
}
void
setDimY
(
int
nY
)
{
...
...
sources/softs/data2data/main.cpp
View file @
aa1042fa
...
...
@@ -107,11 +107,16 @@ int main(int argc, char** argv)
if
(
dynamic_cast
<
vertical_segment
*>
(
d_out
)
!=
NULL
)
{
params
::
input
param
=
params
::
parse_input
(
args
[
"param"
]);
if
(
param
=
=
params
::
UNKNOWN_INPUT
)
if
(
param
==
params
::
UNKNOWN_INPUT
&&
d_in
->
input_parametrization
()
!
=
params
::
UNKNOWN_INPUT
)
{
std
::
cerr
<<
"<<ERROR>> unable to parse the parametrization
"
<<
std
::
endl
;
return
-
1
;
std
::
cout
<<
"<<DEBUG>> using the input file input param for the output file.
"
<<
std
::
endl
;
param
=
d_in
->
input_parametrization
()
;
}
else
if
(
param
==
params
::
UNKNOWN_INPUT
)
{
std
::
cerr
<<
"<<ERROR>> not parametrization defined for input and output files."
<<
std
::
endl
;
return
-
1
;
}
d_out
->
setParametrization
(
param
);
d_out
->
setDimX
(
params
::
dimension
(
param
));
...
...
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