Skip to content

Commit

Permalink
updated submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebertolazzi
ebertolazzi committed Oct 7, 2024
1 parent 7eae28a commit cee6124
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
2 changes: 1 addition & 1 deletion submodules/GenericContainer
Submodule GenericContainer updated 55 files
+2 −151 examples/data2.json
+58 −13 examples/example15.cc
+74 −74 src/GenericContainer.cc
+111 −98 src/GenericContainerSerialize.cc
+98 −130 src_json_interface/jsonLexer.cc
+8 −12 src_json_interface/jsonLexer.hh
+63 −86 src_json_interface/jsonParser.tab.cc
+37 −18 src_json_interface/jsonParser.tab.hh
+48 −29 src_json_interface/jsonParser.yy
+0 −233 src_json_interface/test/a.json
+0 −19 src_json_interface/test/b.json
+0 −38 src_json_interface/test/jsonLexer.hh
+0 −59 src_json_interface/test/jsonLexer.ll
+0 −1,730 src_json_interface/test/lex.yy.cc
+0 −50 src_json_interface/test/main.cc
+0 −26 src_json_interface/test/makefile
+ − src_json_interface/test/prog
+0 −52 src_json_interface/test2/CMakeLists.txt
+0 −233 src_json_interface/test2/a.json
+0 −19 src_json_interface/test2/b.json
+0 −133 src_json_interface/test2/jsonLexer.cc
+0 −47 src_json_interface/test2/jsonLexer.hh
+0 −1,208 src_json_interface/test2/jsonParser.tab.cc
+0 −889 src_json_interface/test2/jsonParser.tab.hh
+0 −142 src_json_interface/test2/jsonParser.yy
+0 −304 src_json_interface/test2/location.hh
+0 −50 src_json_interface/test2/main.cc
+ − src_json_interface/test2/prog
+0 −52 src_json_interface/test3/CMakeLists.txt
+0 −165 src_json_interface/test3/jsonLexer.cc
+0 −1,208 src_json_interface/test3/jsonParser.tab.cc
+0 −889 src_json_interface/test3/jsonParser.tab.hh
+0 −142 src_json_interface/test3/jsonParser.yy
+0 −304 src_json_interface/test3/location.hh
+0 −23 src_json_interface/test3/makefile
+0 −52 src_json_interface/test4/CMakeLists.txt
+0 −233 src_json_interface/test4/a.json
+0 −19 src_json_interface/test4/b.json
+0 −129 src_json_interface/test4/data.json
+0 −172 src_json_interface/test4/jsonParser.cc
+0 −125 src_json_interface/test4/jsonParser.hh
+0 −46 src_json_interface/test4/main.cc
+0 −18 src_json_interface/test4/makefile
+ − src_json_interface/test4/prog
+0 −0 src_json_interface/test_json_parser/CMakeLists.txt
+169 −0 src_json_interface/test_json_parser/jsonLexer.cc
+8 −12 src_json_interface/test_json_parser/jsonLexer.hh
+63 −86 src_json_interface/test_json_parser/jsonParser.tab.cc
+29 −21 src_json_interface/test_json_parser/jsonParser.tab.hh
+40 −33 src_json_interface/test_json_parser/jsonParser.yy
+0 −0 src_json_interface/test_json_parser/location.hh
+0 −0 src_json_interface/test_json_parser/main.cc
+0 −0 src_json_interface/test_json_parser/makefile
+17 −3 src_yaml_interface/from_yaml.cc
+24 −2 src_yaml_interface/to_yaml.cc
2 changes: 1 addition & 1 deletion submodules/UtilsLite
Submodule UtilsLite updated 58 files
+468 −0 docs/d1/df8/class_utils_1_1_console.html
+12 −0 docs/d1/df8/class_utils_1_1_console.js
+12 −0 docs/d3/d48/class_utils_1_1_console-members.html
+9 −9 docs/d5/d80/class_utils_1_1_thread_pool0-members.html
+1 −1 docs/d6/da2/group___o_s.html
+24 −23 docs/d7/d61/_thread_pool0_8hxx_source.html
+159 −0 docs/d7/d89/_console__old_8hxx.html
+5 −0 docs/d7/d89/_console__old_8hxx.js
+582 −0 docs/d7/d89/_console__old_8hxx_source.html
+6 −6 docs/d7/df6/class_utils_1_1_thread_pool_base.html
+136 −3 docs/d8/d87/_console_8hxx_source.html
+0 −299 docs/d9/d18/group___t_h_r_e_a_d.html
+10 −19 docs/d9/d18/group___t_h_r_e_a_d.js
+13 −1 docs/da/d58/deprecated.html
+302 −28 docs/df/d9e/class_utils_1_1_thread_pool0.html
+9 −9 docs/df/d9e/class_utils_1_1_thread_pool0.js
+21 −9 docs/doxygen_crawl.html
+1 −1 docs/functions_e.html
+1 −1 docs/functions_func_e.html
+1 −1 docs/functions_func_j.html
+1 −1 docs/functions_func_n.html
+1 −1 docs/functions_func_r.html
+13 −1 docs/functions_func_s.html
+2 −2 docs/functions_func_t.html
+1 −1 docs/functions_func_w.html
+1 −1 docs/functions_func_~.html
+1 −1 docs/functions_j.html
+1 −1 docs/functions_n.html
+1 −1 docs/functions_r.html
+13 −1 docs/functions_s.html
+2 −2 docs/functions_t.html
+1 −1 docs/functions_w.html
+1 −1 docs/functions_~.html
+4 −4 docs/navtreedata.js
+37 −37 docs/navtreeindex1.js
+25 −25 docs/navtreeindex2.js
+25 −25 docs/navtreeindex3.js
+16 −16 docs/navtreeindex4.js
+24 −0 docs/navtreeindex5.js
+134 −0 docs/navtreeindex6.js
+1 −1 docs/search/all_11.js
+1 −1 docs/search/all_14.js
+1 −1 docs/search/all_18.js
+76 −64 docs/search/all_19.js
+2 −2 docs/search/all_1a.js
+1 −1 docs/search/all_1d.js
+1 −1 docs/search/all_21.js
+1 −1 docs/search/all_c.js
+1 −1 docs/search/functions_10.js
+54 −42 docs/search/functions_11.js
+2 −2 docs/search/functions_12.js
+1 −1 docs/search/functions_15.js
+1 −1 docs/search/functions_19.js
+1 −1 docs/search/functions_4.js
+1 −1 docs/search/functions_9.js
+1 −1 docs/search/functions_c.js
+144 −0 src/Utils/Console.hxx
+3 −0 src/Utils/ThreadPool0.hxx
9 changes: 8 additions & 1 deletion toolbox/cmake_utils/Rakefile_common.rb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
#
#
%w(colorize fileutils pathname rubygems/package net/http zip zlib uri openssl).each do |gem|
%w(colorize fileutils pathname rubygems/package net/http zlib uri openssl).each do |gem|
begin
require gem
rescue LoadError
Expand All @@ -10,6 +10,13 @@
end
end

begin
require 'zip'
rescue LoadError
warn "Install the rubyzip gem:\n $ (sudo) gem install rubyzip".magenta
exit 1
end

require 'rake/clean'
# avoid to remove file "core" (in Eigen inclusion)
CLEAN.clear_exclude.exclude { |fn| fn.pathmap("%f").downcase == "core" }
Expand Down
23 changes: 12 additions & 11 deletions toolbox/src_mex/GenericContainerMatlabInterface.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,9 @@ namespace GC_namespace {
mwSize k = 0;
for ( mwSize j = 0; j < dims[1]; ++j ) {
for ( mwSize i = 0; i < dims[0]; ++i ) {
ptr[k] = val(i,j).real();
pti[k] = val(i,j).imag();
complex_type const & vij{ val(i,j) };
ptr[k] = vij.real();
pti[k] = vij.imag();
++k;
}
}
Expand All @@ -478,7 +479,7 @@ namespace GC_namespace {
void
GenericContainer_to_mxArray( GenericContainer const & gc, mxArray * & mx ) {
static char const where[] = "in GenericContainer_to_mxArray: ";
mwSize dims[2] = {1,1};
mwSize dims[2]{1,1};
switch ( gc.get_type() ) {
case GC_type::NOTYPE:
case GC_type::POINTER:
Expand Down Expand Up @@ -571,8 +572,8 @@ namespace GC_namespace {
mx = mxCreateNumericArray(2,dims,mxINT32_CLASS,mxREAL);
int_type * ptr = static_cast<int_type *>(mxGetData(mx));
mwSize k = 0;
for ( mwSize j = 0; j < dims[1]; ++j )
for ( mwSize i = 0; i < dims[0]; ++i )
for ( mwSize j{0}; j < dims[1]; ++j )
for ( mwSize i{0}; i < dims[0]; ++i )
ptr[k++] = gc.get_int_at(i,j,where);
}
break;
Expand All @@ -583,8 +584,8 @@ namespace GC_namespace {
mx = mxCreateNumericArray(2,dims,mxINT64_CLASS,mxREAL);
long_type * ptr = static_cast<long_type *>(mxGetData(mx));
mwSize k = 0;
for ( mwSize j = 0; j < dims[1]; ++j )
for ( mwSize i = 0; i < dims[0]; ++i )
for ( mwSize j{0}; j < dims[1]; ++j )
for ( mwSize i{0}; i < dims[0]; ++i )
ptr[k++] = gc.get_long_at(i,j,where);
}
break;
Expand All @@ -595,8 +596,8 @@ namespace GC_namespace {
mx = mxCreateNumericArray(2,dims,mxDOUBLE_CLASS,mxREAL);
real_type * ptr = mxGetPr(mx);
mwSize k = 0;
for ( mwSize j = 0; j < dims[1]; ++j )
for ( mwSize i = 0; i < dims[0]; ++i )
for ( mwSize j{0}; j < dims[1]; ++j )
for ( mwSize i{0}; i < dims[0]; ++i )
ptr[k++] = gc.get_real_at(i,j,where);
}
break;
Expand All @@ -608,8 +609,8 @@ namespace GC_namespace {
real_type * ptr = mxGetPr(mx);
real_type * pti = mxGetPi(mx);
mwSize k = 0;
for ( mwSize j = 0; j < dims[1]; ++j ) {
for ( mwSize i = 0; i < dims[0]; ++i ) {
for ( mwSize j{0}; j < dims[1]; ++j ) {
for ( mwSize i{0}; i < dims[0]; ++i ) {
complex_type val = gc.get_complex_at(i,j,where);
ptr[k] = val.real();
pti[k] = val.imag();
Expand Down

0 comments on commit cee6124

Please sign in to comment.