Merge branch 'development' into feature-SMtower-2L

FlexibleSUSY · Nov 28, 2016 · f1b4f98 · f1b4f98
2 parents ebc6876 + 32ddf31
commit f1b4f98
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -52,6 +52,10 @@ FlexibleSUSY-1.7.2 [not released yet]
    of the matching scale.  This matters when the (unphysical) matching
    is varied through FlexibleSUSY[19].
 
+ * Bugfix (commits a643be5, cc9ebf1): Avoid function call ambiguities
+   when multiple LibraryLink libraries are loaded into Mathematica at
+   the same time.
+
 FlexibleSUSY-1.7.1 [October, 15 2016]
 
  * Change (commit b1efa8c): Updated to GM2Calc 1.3.0.

diff --git a/test/test_CMSSM_benchmark.cpp b/test/test_CMSSM_benchmark.cpp
@@ -41,7 +41,7 @@ bool is_valid_spectrum(const std::string& slha_file)
    return true;
 }
 
-int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
+void run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
 {
    int status;
    flexiblesusy::Stopwatch stopwatch;
@@ -55,15 +55,14 @@ int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
    stopwatch.stop();
 
    fs_data.time = stopwatch.get_time_in_seconds();
+   fs_data.sum_of_times += fs_data.time;
    fs_data.error = status;
 
    if (!fs_data.error) {
       // look for errors in the SLHA output file
       fs_data.error = !is_valid_spectrum(slha_output_file);
-      if (!fs_data.error) {
+      if (!fs_data.error)
          fs_data.number_of_valid_points++;
-         fs_data.sum_of_times += fs_data.time;
-      }
    }
 
    stopwatch.start();
@@ -72,18 +71,15 @@ int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
    stopwatch.stop();
 
    ss_data.time = stopwatch.get_time_in_seconds();
+   ss_data.sum_of_times += ss_data.time;
    ss_data.error = status;
 
    if (!ss_data.error) {
       // look for errors in the SLHA output file
       ss_data.error = !is_valid_spectrum(slha_output_file);
-      if (!ss_data.error) {
+      if (!ss_data.error)
          ss_data.number_of_valid_points++;
-         ss_data.sum_of_times += ss_data.time;
-      }
    }
-
-   return 0;
 }
 
 SLHAea::Coll create_point(double tanBeta)

diff --git a/test/test_NMSSM_benchmark.cpp b/test/test_NMSSM_benchmark.cpp
@@ -41,7 +41,7 @@ bool is_valid_spectrum(const std::string& slha_file)
    return true;
 }
 
-int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
+void run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
 {
    int status;
    flexiblesusy::Stopwatch stopwatch;
@@ -55,15 +55,14 @@ int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
    stopwatch.stop();
 
    fs_data.time = stopwatch.get_time_in_seconds();
+   fs_data.sum_of_times += fs_data.time;
    fs_data.error = status;
 
    if (!fs_data.error) {
       // look for errors in the SLHA output file
       fs_data.error = !is_valid_spectrum(slha_output_file);
-      if (!fs_data.error) {
+      if (!fs_data.error)
          fs_data.number_of_valid_points++;
-         fs_data.sum_of_times += fs_data.time;
-      }
    }
 
    stopwatch.start();
@@ -72,18 +71,15 @@ int run_point(const std::string& slha_file, Data& fs_data, Data& ss_data)
    stopwatch.stop();
 
    ss_data.time = stopwatch.get_time_in_seconds();
+   ss_data.sum_of_times += ss_data.time;
    ss_data.error = status;
 
    if (!ss_data.error) {
       // look for errors in the SLHA output file
       ss_data.error = !is_valid_spectrum(slha_output_file);
-      if (!ss_data.error) {
+      if (!ss_data.error)
          ss_data.number_of_valid_points++;
-         ss_data.sum_of_times += ss_data.time;
-      }
    }
-
-   return 0;
 }
 
 SLHAea::Coll create_point(double tanBeta)

diff --git a/test/test_multiple_librarylinks.m b/test/test_multiple_librarylinks.m
@@ -12,6 +12,8 @@
 TestEquality[FSSMGetInputParameters[hSMtower]  , $Failed];
 TestEquality[FSSMGetSMInputParameters[hSMtower], $Failed];
 TestEquality[FSSMGetSettings[hSMtower]         , $Failed];
+TestEquality[FSSMCalculateSpectrum[hSMtower]   , $Failed];
+TestEquality[FSSMCalculateObservables[hSMtower], $Failed];
 
 hSM = FSSMOpenHandle[betaFunctionLoopOrder -> 2, Mt -> 173, LambdaIN -> 0.1, Qin -> 1000];