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
295c7e51
Commit
295c7e51
authored
Nov 21, 2013
by
pacanows
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
6e91ffd9
9efd62b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
91 additions
and
23 deletions
+91
-23
sources/softs/brdf2data/main.cpp
sources/softs/brdf2data/main.cpp
+11
-15
sources/softs/data2moments/main.cpp
sources/softs/data2moments/main.cpp
+76
-8
sources/xml/3d/retro/3M_jaune_abc.xml
sources/xml/3d/retro/3M_jaune_abc.xml
+4
-0
No files found.
sources/softs/brdf2data/main.cpp
View file @
295c7e51
...
...
@@ -18,8 +18,8 @@ int main(int argc, char** argv)
arguments
args
(
argc
,
argv
)
;
if
(
args
.
is_defined
(
"help"
))
{
std
::
cout
<<
"
<<HELP>> brdf2data --input brdf.file --func importer.so --output data.file --data exporter.so
"
<<
std
::
endl
;
std
::
cout
<<
" - input, output
, func, data are mandatory parameters
"
<<
std
::
endl
;
std
::
cout
<<
"
Usage: brdf2data --input brdf.file --output data.file [--data exporter.so --data-file data.file]
"
<<
std
::
endl
;
std
::
cout
<<
" - input, output
are mandatory parameters, you need to either specify a data exporter or a data file
"
<<
std
::
endl
;
return
0
;
}
...
...
@@ -35,22 +35,18 @@ int main(int argc, char** argv)
std
::
cerr
<<
"<<ERROR>> the data exporter is not defined"
<<
std
::
endl
;
return
1
;
}
/*
if(! args.is_defined("func")) {
std::cerr << "<<ERROR>> the function importer is not defined" << std::endl ;
return 1 ;
}
*/
// Import data
// Get the associated data object and load the file is any
data
*
d
=
NULL
;
d
=
plugins_manager
::
get_data
(
args
[
"data"
])
;
d
=
plugins_manager
::
get_data
(
args
[
"data"
])
;
if
(
args
.
is_defined
(
"data-file"
))
{
d
->
load
(
args
[
"data-file"
]);
}
// Get the function file
function
*
f
=
NULL
;
f
=
plugins_manager
::
get_function
(
args
);
// Modify function or data to provide coherent
// interfaces
// plugins_manager::check_compatibility(d, f, args);
f
=
plugins_manager
::
get_function
(
args
);
if
(
d
!=
NULL
&&
f
!=
NULL
)
{
...
...
sources/softs/data2moments/main.cpp
View file @
295c7e51
...
...
@@ -80,6 +80,15 @@ int main(int argc, char** argv)
vec
m_xx
(
nY
);
vec
m_xy
(
nY
);
vec
m_yy
(
nY
);
vec
m_xxx
(
nY
);
vec
m_xxy
(
nY
);
vec
m_xyy
(
nY
);
vec
m_yyy
(
nY
);
vec
m_xxxx
(
nY
);
vec
m_xxxy
(
nY
);
vec
m_xxyy
(
nY
);
vec
m_xyyy
(
nY
);
vec
m_yyyy
(
nY
);
// Cumulants
vec
k_x
(
nY
);
...
...
@@ -87,6 +96,15 @@ int main(int argc, char** argv)
vec
k_xx
(
nY
);
vec
k_xy
(
nY
);
vec
k_yy
(
nY
);
vec
k_xxx
(
nY
);
vec
k_xxy
(
nY
);
vec
k_xyy
(
nY
);
vec
k_yyy
(
nY
);
vec
k_xxxx
(
nY
);
vec
k_xxxy
(
nY
);
vec
k_xxyy
(
nY
);
vec
k_xyyy
(
nY
);
vec
k_yyyy
(
nY
);
#ifndef OLD
// Number of elements per dimension
...
...
@@ -122,6 +140,15 @@ int main(int argc, char** argv)
m_xx
=
vec
::
Zero
(
nY
);
m_xy
=
vec
::
Zero
(
nY
);
m_yy
=
vec
::
Zero
(
nY
);
m_xxx
=
vec
::
Zero
(
nY
);
m_xxy
=
vec
::
Zero
(
nY
);
m_xyy
=
vec
::
Zero
(
nY
);
m_yyy
=
vec
::
Zero
(
nY
);
m_xxxx
=
vec
::
Zero
(
nY
);
m_xxxy
=
vec
::
Zero
(
nY
);
m_xxyy
=
vec
::
Zero
(
nY
);
m_xyyy
=
vec
::
Zero
(
nY
);
m_yyyy
=
vec
::
Zero
(
nY
);
// Integrate the moments over the integration domain
for
(
int
i
=
0
;
i
<
nb
;
++
i
)
...
...
@@ -158,6 +185,15 @@ int main(int argc, char** argv)
m_xx
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
];
m_xy
[
k
]
+=
val
*
x
[
0
]
*
x
[
1
];
m_yy
[
k
]
+=
val
*
x
[
1
]
*
x
[
1
];
m_xxx
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
]
*
x
[
0
];
m_xxy
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
]
*
x
[
1
];
m_xyy
[
k
]
+=
val
*
x
[
0
]
*
x
[
1
]
*
x
[
1
];
m_yyy
[
k
]
+=
val
*
x
[
1
]
*
x
[
1
]
*
x
[
1
];
m_xxxx
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
]
*
x
[
0
]
*
x
[
0
];
m_xxxy
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
]
*
x
[
0
]
*
x
[
1
];
m_xxyy
[
k
]
+=
val
*
x
[
0
]
*
x
[
0
]
*
x
[
1
]
*
x
[
1
];
m_xyyy
[
k
]
+=
val
*
x
[
0
]
*
x
[
1
]
*
x
[
1
]
*
x
[
1
];
m_yyyy
[
k
]
+=
val
*
x
[
1
]
*
x
[
1
]
*
x
[
1
]
*
x
[
1
];
}
}
...
...
@@ -168,6 +204,15 @@ int main(int argc, char** argv)
m_xx
[
k
]
/=
m_0
[
k
];
m_xy
[
k
]
/=
m_0
[
k
];
m_yy
[
k
]
/=
m_0
[
k
];
m_xxx
[
k
]
/=
m_0
[
k
];
m_xxy
[
k
]
/=
m_0
[
k
];
m_xyy
[
k
]
/=
m_0
[
k
];
m_yyy
[
k
]
/=
m_0
[
k
];
m_xxxx
[
k
]
/=
m_0
[
k
];
m_xxxy
[
k
]
/=
m_0
[
k
];
m_xxyy
[
k
]
/=
m_0
[
k
];
m_xyyy
[
k
]
/=
m_0
[
k
];
m_yyyy
[
k
]
/=
m_0
[
k
];
}
// compute cumulants
...
...
@@ -176,14 +221,37 @@ int main(int argc, char** argv)
k_xx
=
m_xx
-
product
(
m_x
,
m_x
);
k_xy
=
m_xy
-
product
(
m_x
,
m_y
);
k_yy
=
m_yy
-
product
(
m_y
,
m_y
);
std
::
cout
<<
"<<RESULT>> moment 0: "
<<
m_0
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment x: "
<<
m_x
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment y: "
<<
m_y
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xx: "
<<
m_xx
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xy: "
<<
m_xy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment yy: "
<<
m_yy
<<
std
::
endl
;
k_xxx
=
m_xxx
-
3
*
product
(
m_xx
,
m_x
)
+
2
*
product
(
m_x
,
product
(
m_x
,
m_x
));
k_xxy
=
m_xxy
-
product
(
m_xx
,
m_y
)
-
2
*
product
(
m_xy
,
m_x
)
+
2
*
product
(
m_x
,
product
(
m_x
,
m_y
));
k_xyy
=
m_xyy
-
product
(
m_yy
,
m_x
)
-
2
*
product
(
m_xy
,
m_y
)
+
2
*
product
(
m_x
,
product
(
m_y
,
m_y
));
k_yyy
=
m_yyy
-
3
*
product
(
m_yy
,
m_y
)
+
2
*
product
(
m_y
,
product
(
m_y
,
m_y
));
#ifdef NOT
k_xxxx
=
m_xxxx
-
4
*
m_xxx
*
m_x
-
3
*
m_xx
*
m_xx
+
12
*
m_xx
*
m_x
*
m_x
-
6
*
m_x
*
m_x
*
m_x
*
m_x
;
k_xxxy
=
m_xxxy
-
3
*
m_xxy
*
m_x
-
m_xxx
*
m_y
-
3
*
m_xx
*
m_xy
+
6
*
m_xx
*
m_x
*
m_y
+
6
*
m_xy
*
m_x
*
m_x
-
6
*
m_x
*
m_x
*
m_x
*
m_y
;
k_xxyy
=
m_xxyy
-
2
*
m_xxy
*
m_y
-
m_xyy
*
m_x
-
2
*
m_xy
*
m_xy
-
m_xx
*
m_yy
+
8
*
m_xy
*
m_x
*
m_y
+
2
*
m_xx
*
m_y
*
m_y
+
2
*
m_yy
*
m_x
*
m_x
-
6
*
m_x
*
m_x
*
m_y
*
m_y
;
k_xyyy
=
m_xyyy
-
3
*
m_xyy
*
m_y
-
m_yyy
*
m_x
-
3
*
m_yy
*
m_xy
+
6
*
m_yy
*
m_x
*
m_y
+
6
*
m_xy
*
m_y
*
m_y
-
6
*
m_x
*
m_y
*
m_y
*
m_y
;
k_yyyy
=
m_yyyy
-
4
*
m_yyy
*
m_y
-
3
*
m_yy
*
m_yy
+
12
*
m_yy
*
m_y
*
m_y
-
6
*
m_y
*
m_y
*
m_y
*
m_y
;
#endif
std
::
cout
<<
"<<RESULT>> moment 0: "
<<
m_0
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment x: "
<<
m_x
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment y: "
<<
m_y
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xx: "
<<
m_xx
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xy: "
<<
m_xy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment yy: "
<<
m_yy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xxx: "
<<
m_xxx
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xxy: "
<<
m_xxy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xyy: "
<<
m_xyy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment yyy: "
<<
m_yyy
<<
std
::
endl
;
#ifdef NOT
std
::
cout
<<
"<<RESULT>> moment xxxx: "
<<
m_xxxx
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xxxy: "
<<
m_xxxy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xxyy: "
<<
m_xxyy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment xyyy: "
<<
m_xyyy
<<
std
::
endl
;
std
::
cout
<<
"<<RESULT>> moment yyyy: "
<<
m_yyyy
<<
std
::
endl
;
#endif
#else
// Options
bool
with_cosine
=
args
.
is_defined
(
"cosine"
);
...
...
sources/xml/3d/retro/3M_jaune_abc.xml
View file @
295c7e51
...
...
@@ -29,6 +29,7 @@
<!-- Parameters -->
<parameter
name=
"min"
value=
"[0.1, -2, -2]"
/>
<parameter
name=
"max"
value=
"[1.7, 0, 2]"
/>
<parameter
name=
"data-correct-cosine"
value=
""
/>
</action>
<action
name=
"data2brdf"
>
...
...
@@ -50,6 +51,7 @@
<parameter
name=
"min"
value=
"[0.1, -2, -2]"
/>
<parameter
name=
"max"
value=
"[1.7, 0, 2]"
/>
<parameter
name=
"bootstrap"
value=
"./results/3d/retro/3M_jaune_abc.brdf"
/>
<parameter
name=
"data-correct-cosine"
value=
""
/>
</action>
<action
name=
"data2brdf"
>
...
...
@@ -74,6 +76,7 @@
<parameter
name=
"min"
value=
"[0.1, -2, -2]"
/>
<parameter
name=
"max"
value=
"[1.7, 2, 2]"
/>
<parameter
name=
"bootstrap"
value=
"./results/3d/retro/3M_jaune_abc.brdf"
/>
<parameter
name=
"data-correct-cosine"
value=
""
/>
</action>
<action
name=
"data2brdf"
>
...
...
@@ -99,6 +102,7 @@
<parameter
name=
"min"
value=
"[0.1, -2, -2]"
/>
<parameter
name=
"max"
value=
"[1.7, 2, 2]"
/>
<parameter
name=
"bootstrap"
value=
"./results/3d/retro/3M_jaune_abc.brdf"
/>
<parameter
name=
"data-correct-cosine"
value=
""
/>
</action>
<!-- Export the fit -->
...
...
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