This is release 2.3.4c

distrib/core/HOWTO

 cd /G/f2
 
 ### merge devel into master
-git rebase -i HEAD~99 # correct commit messages; do not go past last tag or branch from master
+# git rebase -i HEAD~99 # correct commit messages; do not go past last tag or branch from master
 git checkout master
 git pull origin master
 git merge --no-ff devel

pub/CHANGELOG

+Release 2.3.4c of 27jan17:
+
+- New function NOlo::j2j to prepare for better J:J matching in mpgi, mpgr, and elsewhere
+- Correct CMake mechanism in ptest
+- Explicit library dependence in utest/CMakeLists.txt
+- Copy edit CMake files
+- Previous release had erroneous path 2.3,4b (comma instead of point)
+
 Release 2.3.4b of 25jan17:
 
 - Grid created by fm now ends with x[ni-1]=1.

pub/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 
 project(Frida)
 
-set(Frida_VERSION 2.3.4b)
+set(Frida_VERSION 2.3.4c)
 
 include(CTest) # equivalent to "enable_testing() ???
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) # => 'make check' is an alias for 'ctest'
@@ -45,11 +45,9 @@ add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(share)
 add_subdirectory(man)
-add_subdirectory(utest)
-add_subdirectory(ftest)
+add_subdirectory(utest) # unit tests
+add_subdirectory(ftest) # functional tests (run Frida with given script)
 
 # --- Additional tests to be activated when needed ---
-# performance tests
-add_subdirectory(ptest)
-# interactive readline test
-# add_subdirectory(readplus/test)
+add_subdirectory(ptest) # performance tests
+# add_subdirectory(readplus/test) # interactive readline test

pub/ftest/CMakeLists.txt

@@ -15,5 +15,9 @@ foreach(test_src ${test_sources})
     # remove directory path and suffix, to retain just the name of the test
     string(REGEX REPLACE ".*/" "" test_name "${test_src}")
     string(REGEX REPLACE ".f2t$" "" test_name "${test_name}")
-    add_test(NAME ${test_name} COMMAND ${CMAKE_BINARY_DIR}/src/frida ARGUMENTS ${test_src} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    add_test(
+        NAME ${test_name}
+        COMMAND ${CMAKE_BINARY_DIR}/src/frida
+        ARGUMENTS ${test_src}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endforeach(test_src)

pub/lib/CMakeLists.txt

@@ -89,7 +89,10 @@ ${FLEX_xaxlex_OUTPUTS}
 
 set_target_properties(libfrida PROPERTIES OUTPUT_NAME frida)
 
-target_link_libraries(libfrida libreadplus libtrivia libfridaplot
+target_link_libraries(libfrida
+    libreadplus
+    libtrivia
+    libfridaplot
     pthread
     ${GSL_LIBRARIES}
     ${FFTW_LIBRARIES}

pub/lib/curve.cpp

@@ -352,16 +352,6 @@ void NCurveFile::get_conv(const CSpec** sv, int* kv, int* jv, int k, int j)
         return;
     }
     const COld* fv = SMem::instance()->mem_get_D(*kv);
-
-    // set *jv and *sv for given j:
-    if (j >= fc->nJ())
-        throw S("BUG: setConv called with invalid j");
-    if (fv->nJ() == 1) // nJ:1  correspondence
-        *jv = 0;
-    else if (fv->nJ() == fc->nJ()) // nJ:nJ correspondence
-        *jv = j;
-    else
-        throw "cannot convolute file " + S(k) + " with resolution " + S(*kv)
-            + ": number of spectra does not match";
+    *jv = NOlo::j2j( fc, j, fv );
     *sv = fv->VS(*jv);
 }

pub/lib/olf.cpp

@@ -728,3 +728,19 @@ string COlc::weight_str() const
     }
     throw S("BUG: unexpected weight");
 }
+
+//**************************************************************************************************
+//*  namespace NOlo - service functions
+//**************************************************************************************************
+
+int NOlo::j2j(const COlo* fin, int jin, const COlo* fout )
+{
+    if (jin >= fin->nJ())
+        throw S("BUG: NOlo::j2j called with invalid j");
+    if (fout->nJ() == 1) // nJ:1  correspondence
+        return 0;
+    else if (fout->nJ() == fin->nJ()) // nJ:nJ correspondence
+        return jin;
+    else
+        throw S("Wrong file correspondence: number of spectra does not match");
+}

pub/lib/olf.hpp

@@ -164,4 +164,12 @@ public:
     virtual string type() const { return "curve"; }
 };
 
+
+//! Service functions for online objects.
+
+namespace NOlo {
+    int j2j(const COlo* fin, int jin, const COlo* fout );
+} // namespace NOlo
+
+
 #endif // OLF_H

pub/plot/CMakeLists.txt

@@ -14,13 +14,10 @@ dualplot.hpp
 plowin.hpp
 )
 
-add_library(libfridaplot SHARED
-${src_files}
-)
+add_library(libfridaplot SHARED ${src_files})
 
 set_target_properties(libfridaplot PROPERTIES OUTPUT_NAME fridaplot)
 
-target_link_libraries(libfridaplot
-)
+target_link_libraries(libfridaplot)
 
 install(TARGETS libfridaplot DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

pub/ptest/CMakeLists.txt

@@ -15,5 +15,9 @@ foreach(test_src ${test_sources})
     # remove directory path and suffix, to retain just the name of the test
     string(REGEX REPLACE ".*/" "" test_name "${test_src}")
     string(REGEX REPLACE ".f2t$" "" test_name "${test_name}")
-    add_test(NAME ${test_name} COMMAND "${test_src}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+    add_test(
+        NAME ${test_name}
+        COMMAND ${CMAKE_BINARY_DIR}/src/frida
+        ARGUMENTS ${test_src}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endforeach(test_src)

pub/readplus/CMakeLists.txt

@@ -14,9 +14,7 @@ macro.hpp
 readln.hpp
 )
 
-add_library(libreadplus SHARED
-${src_files}
-)
+add_library(libreadplus SHARED ${src_files})
 
 set_target_properties(libreadplus PROPERTIES OUTPUT_NAME readplus)
 

pub/src/CMakeLists.txt

@@ -8,6 +8,10 @@ set(src_files frida2.cpp)
 
 add_executable(frida frida2.cpp)
 
-target_link_libraries(frida libfrida)
+target_link_libraries(frida
+    libtrivia
+    libreadplus
+    ${GSL_LIBRARIES}
+    libfrida)
 
 install(TARGETS frida DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

pub/trivia/CMakeLists.txt

@@ -25,13 +25,10 @@ vector_ops.hpp
 yaml_out.hpp
 )
 
-add_library(libtrivia SHARED
-${src_files}
-)
+add_library(libtrivia SHARED ${src_files})
 
 set_target_properties(libtrivia PROPERTIES OUTPUT_NAME trivia)
 
-target_link_libraries(libtrivia
-)
+target_link_libraries(libtrivia)
 
 install(TARGETS libtrivia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

pub/utest/CMakeLists.txt

@@ -27,6 +27,7 @@ set(test_link_libs
     gtest_main
     libtrivia
     libreadplus
+    ${GSL_LIBRARIES}
     libfrida
     )