diff --git a/src/include/Configuration.h b/src/include/Configuration.h
index 4b80aca1056df77fdd5d57bbadfdf6560dec4cce..b90c0a931d87b130a385369781f9d50c5b8fb4d1 100644
--- a/src/include/Configuration.h
+++ b/src/include/Configuration.h
@@ -158,7 +158,7 @@ public:
* \return config: `GeometryConfiguration*` Pointer to object containing the
* configuration data.
*/
- static GeometryConfiguration *from_legacy(std::string file_name);
+ static GeometryConfiguration *from_legacy(const std::string& file_name);
/*! \brief Get the value of a parameter by name.
*
@@ -172,7 +172,7 @@ public:
* \param param_name: `string` Name of the parameter to be retrieved.
* \return value: `double` Value of the requested parameter.
*/
- double get_param(std::string param_name);
+ double get_param(const std::string& param_name);
/*! \brief Get the X coordinate of a sphere by its index.
*
@@ -255,7 +255,7 @@ protected:
* \return config: `ScattererConfiguration*` Pointer to object containing the
* scatterer configuration data.
*/
- static ScattererConfiguration *from_hdf5(std::string file_name);
+ static ScattererConfiguration *from_hdf5(const std::string& file_name);
/*! \brief Build configuration from legacy binary input file.
*
@@ -268,7 +268,7 @@ protected:
* \return config: `ScattererConfiguration*` Pointer to object containing the
* scatterer configuration data.
*/
- static ScattererConfiguration *from_legacy(std::string file_name);
+ static ScattererConfiguration *from_legacy(const std::string& file_name);
/*! \brief Write the scatterer configuration data to HDF5 binary output.
*
@@ -278,7 +278,7 @@ protected:
*
* \param file_name: `string` Name of the binary configuration data file.
*/
- void write_hdf5(std::string file_name);
+ void write_hdf5(const std::string& file_name);
/*! \brief Write the scatterer configuration data to legacy binary output.
*
@@ -289,7 +289,7 @@ protected:
*
* \param file_name: `string` Name of the binary configuration data file.
*/
- void write_legacy(std::string file_name);
+ void write_legacy(const std::string& file_name);
public:
/*! \brief Build a scatterer configuration structure.
*
@@ -318,7 +318,7 @@ public:
int configs,
double *scale_vector,
int nxi,
- std::string variable_name,
+ const std::string& variable_name,
int *iog_vector,
double *ros_vector,
int *nshl_vector,
@@ -373,7 +373,7 @@ public:
* \return config: `ScattererConfiguration*` Pointer to object containing the
* scatterer configuration data.
*/
- static ScattererConfiguration* from_binary(std::string file_name, std::string mode = "LEGACY");
+ static ScattererConfiguration* from_binary(const std::string& file_name, const std::string& mode = "LEGACY");
/*! \brief Build scatterer configuration from legacy configuration input file.
*
@@ -386,7 +386,7 @@ public:
* \return config: `ScattererConfiguration*` Pointer to object containing the
* scatterer configuration data.
*/
- static ScattererConfiguration* from_dedfb(std::string file_name);
+ static ScattererConfiguration* from_dedfb(const std::string& file_name);
/*! \brief Get the dielectric constant of a material for a specific wavelength.
*
@@ -433,7 +433,7 @@ public:
* \param param_name: `string` Name of the parameter to be retrieved.
* \return value: `double` Value of the requested parameter.
*/
- double get_param(std::string param_name);
+ double get_param(const std::string& param_name);
/*! \brief Get the radius of a sphere by its index.
*
@@ -495,7 +495,7 @@ public:
* \param mode: `string` Binary encoding. Can be one of ["LEGACY", "HDF5"] . Optional
* (default is "LEGACY").
*/
- void write_binary(std::string file_name, std::string mode="LEGACY");
+ void write_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Write the scatterer configuration data to formatted text output.
*
@@ -507,7 +507,7 @@ public:
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_formatted(std::string file_name);
+ void write_formatted(const std::string& file_name);
/*! \brief Test whether two instances of ScattererConfiguration are equal.
*
@@ -520,7 +520,7 @@ public:
* \param other: `ScattererConfiguration &` Reference to the instance to be compared with.
* \return result: `bool` True, if the two instances are equal, false otherwise.
*/
- bool operator ==(ScattererConfiguration &other);
+ bool operator ==(const ScattererConfiguration &other);
};
#endif
diff --git a/src/include/Parsers.h b/src/include/Parsers.h
index 5b11d9f6a383f5c941be1912d20c0fa55860ae90..247013c6925224b40845ba2cd75670015b752304 100644
--- a/src/include/Parsers.h
+++ b/src/include/Parsers.h
@@ -32,6 +32,6 @@
* \return array_lines `string*` An array of strings, one for each input
* file line.
*/
-std::string *load_file(std::string file_name, int *count);
+std::string *load_file(const std::string& file_name, int *count);
#endif /* INCLUDE_PARSERS_H_ */
diff --git a/src/include/TransitionMatrix.h b/src/include/TransitionMatrix.h
index 0e51f1d83a94f33ee4148b351cfc3d2705556d78..6adb60f763132a0c1b9895709763e5506f7f2bbc 100644
--- a/src/include/TransitionMatrix.h
+++ b/src/include/TransitionMatrix.h
@@ -36,7 +36,7 @@ class TransitionMatrix {
* \return config: `TransitionMatrix *` Pointer to object containing the
* transition matrix data.
*/
- static TransitionMatrix *from_hdf5(std::string file_name);
+ static TransitionMatrix *from_hdf5(const std::string& file_name);
/*! \brief Build transition matrix from a legacy binary input file.
*
@@ -44,7 +44,7 @@ class TransitionMatrix {
* \return config: `TransitionMatrix *` Pointer to object containing the
* transition matrix data.
*/
- static TransitionMatrix *from_legacy(std::string file_name);
+ static TransitionMatrix *from_legacy(const std::string& file_name);
/*! \brief Write the Transition Matrix to HDF5 binary output.
*
@@ -54,7 +54,7 @@ class TransitionMatrix {
*
* \param file_name: `string` Name of the binary configuration data file.
*/
- void write_hdf5(std::string file_name);
+ void write_hdf5(const std::string& file_name);
/*! \brief Write transition matrix data to HDF5 binary output.
*
@@ -71,7 +71,7 @@ class TransitionMatrix {
* \param _am0m: `complex double **`
*/
static void write_hdf5(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
double _exri, dcomplex **_am0m
);
@@ -91,7 +91,7 @@ class TransitionMatrix {
* \param _sphere_radius: `double` Radius of the sphere.
*/
static void write_hdf5(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius
);
@@ -99,7 +99,7 @@ class TransitionMatrix {
*
* \param file_name: `string` Name of the binary configuration data file.
*/
- void write_legacy(std::string file_name);
+ void write_legacy(const std::string& file_name);
/*! \brief Write transition matrix data to binary output using legacy format.
*
@@ -116,7 +116,7 @@ class TransitionMatrix {
* \param _am0m: `complex double **`
*/
static void write_legacy(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
double _exri, dcomplex **_am0m
);
@@ -136,7 +136,7 @@ class TransitionMatrix {
* \param _sphere_radius: `double` Radius of the sphere.
*/
static void write_legacy(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius
);
@@ -205,7 +205,7 @@ class TransitionMatrix {
* \return config: `TransitionMatrix *` Pointer to object containing the transition
* matrix data.
*/
- static TransitionMatrix* from_binary(std::string file_name, std::string mode="LEGACY");
+ static TransitionMatrix* from_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Write the Transition Matrix to a binary file.
*
@@ -219,7 +219,7 @@ class TransitionMatrix {
* \param mode: `string` Binary encoding. Can be one of ["LEGACY", "HDF5"] . Optional
* (default is "LEGACY").
*/
- void write_binary(std::string file_name, std::string mode="LEGACY");
+ void write_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Write a cluster Transition Matrix to a binary file without instanciating it.
*
@@ -244,8 +244,8 @@ class TransitionMatrix {
* (default is "LEGACY").
*/
static void write_binary(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
- double _exri, dcomplex **_am0m, std::string mode="LEGACY"
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
+ double _exri, dcomplex **_am0m, const std::string& mode="LEGACY"
);
/*! \brief Write a single sphere Transition Matrix to a binary file without instanciating it.
@@ -272,9 +272,9 @@ class TransitionMatrix {
* (default is "LEGACY").
*/
static void write_binary(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius,
- std::string mode="LEGACY"
+ const std::string& mode="LEGACY"
);
/*! \brief Test whether two instances of TransitionMatrix are equal.
diff --git a/src/include/errors.h b/src/include/errors.h
index 8730b36b70c251e93d4d2707b8900bdcd13870e3..a986defa166fb9c7edbcdf5911f45084461e6590 100644
--- a/src/include/errors.h
+++ b/src/include/errors.h
@@ -64,7 +64,7 @@ public:
*
* \param name: `string` Name of the file that was accessed.
*/
- OpenConfigurationFileException(std::string name) { file_name = name; }
+ OpenConfigurationFileException(const std::string& name) { file_name = name; }
/**
* \brief Exception message.
@@ -86,7 +86,7 @@ public:
*
* \param problem: `string` Description of the problem that occurred.
*/
- MatrixOutOfBoundsException(std::string problem) { message = problem; }
+ MatrixOutOfBoundsException(const std::string& problem) { message = problem; }
/**
* \brief Exception message.
*/
@@ -107,7 +107,7 @@ public:
*
* \param problem: `string` Description of the problem that occurred.
*/
- UnrecognizedConfigurationException(std::string problem) { message = problem; }
+ UnrecognizedConfigurationException(const std::string& problem) { message = problem; }
/**
* \brief Exception message.
*/
@@ -128,7 +128,7 @@ public:
*
* \param problem: `string` Description of the problem that occurred.
*/
- UnrecognizedFormatException(std::string problem) { message = problem; }
+ UnrecognizedFormatException(const std::string& problem) { message = problem; }
/**
* \brief Exception message.
*/
@@ -149,7 +149,7 @@ public:
*
* \param problem: `string` Description of the problem that occurred.
*/
- UnrecognizedParameterException(std::string problem) { message = problem; }
+ UnrecognizedParameterException(const std::string& problem) { message = problem; }
/**
* \brief Exception message.
*/
diff --git a/src/include/file_io.h b/src/include/file_io.h
index a39401dd1fcaea4473543adbc166ad278e260471..a8e31783fe4e8fccd0eca6599c2ab2cadcf022dd 100644
--- a/src/include/file_io.h
+++ b/src/include/file_io.h
@@ -31,7 +31,7 @@ class FileSchema {
* \param rec_types: `string *` Description of the records in the file.
* \param rec_names: `string *` Names of the records in the file.
*/
- FileSchema(int num_rec, std::string *rec_types, std::string *rec_names=NULL);
+ FileSchema(int num_rec, const std::string *rec_types, const std::string *rec_names=NULL);
/*! \brief FileSchema instance destroyer.
*/
@@ -83,7 +83,7 @@ class HDFFile {
* \param fapl_id: `hid_t` File access property list identifier (default is `H5P_DEFAULT`).
*/
HDFFile(
- std::string name, unsigned int flags=H5F_ACC_EXCL,
+ const std::string& name, unsigned int flags=H5F_ACC_EXCL,
hid_t fcpl_id=H5P_DEFAULT, hid_t fapl_id=H5P_DEFAULT
);
@@ -105,7 +105,7 @@ class HDFFile {
* \return hdf_file: `HDFFile *` Pointer to a new, open HDF5 file.
*/
static HDFFile* from_schema(
- FileSchema &schema, std::string name, unsigned int flags=H5F_ACC_EXCL,
+ FileSchema &schema, const std::string& name, unsigned int flags=H5F_ACC_EXCL,
hid_t fcpl_id=H5P_DEFAULT, hid_t fapl_id=H5P_DEFAULT
);
@@ -133,7 +133,7 @@ class HDFFile {
* \return status: `herr_t` Exit status of the operation.
*/
herr_t read(
- std::string dataset_name, std::string data_type, void *buffer,
+ const std::string& dataset_name, const std::string& data_type, void *buffer,
hid_t mem_space_id=H5S_ALL, hid_t file_space_id=H5S_ALL,
hid_t dapl_id=H5P_DEFAULT, hid_t dxpl_id=H5P_DEFAULT
);
@@ -150,7 +150,7 @@ class HDFFile {
* \return status: `herr_t` Exit status of the operation.
*/
herr_t write(
- std::string dataset_name, std::string data_type, const void *buffer,
+ const std::string& dataset_name, const std::string& data_type, const void *buffer,
hid_t mem_space_id=H5S_ALL, hid_t file_space_id=H5S_ALL,
hid_t dapl_id=H5P_DEFAULT, hid_t dxpl_id=H5P_DEFAULT
);
diff --git a/src/include/logging.h b/src/include/logging.h
index fac4d71d780848d35dd0050cda1f48d368b679c2..a8818ea4b2e6f18635e5f1b0a0345ce2d55e1c75 100644
--- a/src/include/logging.h
+++ b/src/include/logging.h
@@ -67,7 +67,7 @@ class Logger {
*
* \param message: `string` The message to be printed.
*/
- void err(std::string message);
+ void err(const std::string& message);
/*! \brief Print a summary of recurrent messages and clear the stack.
*
@@ -80,7 +80,7 @@ class Logger {
* \param message: `string` The message to be printed.
* \param level: `int` The priority level (default is `LOG_INFO = 1`).
*/
- void log(std::string message, int level=LOG_INFO);
+ void log(const std::string& message, int level=LOG_INFO);
/*! \brief Push a recurrent message to the message stack.
*
@@ -92,7 +92,7 @@ class Logger {
*
* \param message: `string` The message to be stacked.
*/
- void push(std::string message);
+ void push(const std::string& message);
};
#endif
diff --git a/src/include/tfrfme.h b/src/include/tfrfme.h
index 2e55c4822b1d186bb7a8094e6ba89aafa46f176c..8f271819242be698c859d58ff3956e12c465cf82 100644
--- a/src/include/tfrfme.h
+++ b/src/include/tfrfme.h
@@ -27,26 +27,26 @@ protected:
* \param file_name: `string` Name of the file to be loaded.
* \return instance: `Swap1 *` Pointer to a new Swap1 instance.
*/
- static Swap1 *from_hdf5(std::string file_name);
+ static Swap1 *from_hdf5(const std::string& file_name);
/*! \brief Load a Swap1 instance from a legacy binary file.
*
* \param file_name: `string` Name of the file to be loaded.
* \return instance: `Swap1 *` Pointer to a new Swap1 instance.
*/
- static Swap1 *from_legacy(std::string file_name);
+ static Swap1 *from_legacy(const std::string& file_name);
/*! \brief Save a Swap1 instance to a HDF5 binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_hdf5(std::string file_name);
+ void write_hdf5(const std::string& file_name);
/*! \brief Save a Swap1 instance to a legacy binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_legacy(std::string file_name);
+ void write_legacy(const std::string& file_name);
public:
/*! \brief Swap1 instance constructor.
@@ -73,7 +73,7 @@ public:
* or "LGEACY". Default is "LEGACY").
* \return instance: `Swap1 *` Pointer to a newly created Swap1 instance.
*/
- static Swap1* from_binary(std::string file_name, std::string mode="LEGACY");
+ static Swap1* from_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Calculate the necessary amount of memory to create a new instance.
*
@@ -99,7 +99,7 @@ public:
* \param mode: `string` Format of the file (can be either "HDF5"
* or "LGEACY". Default is "LEGACY").
*/
- void write_binary(std::string file_name, std::string mode="LEGACY");
+ void write_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Test whether two instances of Swap1 are equal.
*
@@ -157,26 +157,26 @@ protected:
* \param file_name: `string` Name of the file to be loaded.
* \return instance: `Swap2 *` Pointer to a new Swap2 instance.
*/
- static Swap2 *from_hdf5(std::string file_name);
+ static Swap2 *from_hdf5(const std::string& file_name);
/*! \brief Load a Swap2 instance from a legacy binary file.
*
* \param file_name: `string` Name of the file to be loaded.
* \return instance: `Swap2 *` Pointer to a new Swap2 instance.
*/
- static Swap2 *from_legacy(std::string file_name);
+ static Swap2 *from_legacy(const std::string& file_name);
/*! \brief Save a Swap2 instance to a HDF5 binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_hdf5(std::string file_name);
+ void write_hdf5(const std::string& file_name);
/*! \brief Save a Swap2 instance to a legacy binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_legacy(std::string file_name);
+ void write_legacy(const std::string& file_name);
public:
/*! \brief Swap2 instance constructor.
@@ -196,7 +196,7 @@ public:
* or "LGEACY". Default is "LEGACY").
* \return instance: `Swap2 *` Pointer to a newly created Swap2 instance.
*/
- static Swap2* from_binary(std::string file_name, std::string mode="LEGACY");
+ static Swap2* from_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Get the pointer to the VKZM matrix.
*
@@ -216,7 +216,7 @@ public:
* \param param_name: `string` Name of the parameter.
* \return value: `double` The value of the requested parameter.
*/
- double get_param(std::string param_name);
+ double get_param(const std::string& param_name);
/*! \brief Get the pointer to the VKV vector.
*
@@ -249,7 +249,7 @@ public:
* \param param_name: `string` Name of the parameter.
* \param value: `double` The value of the parameter.
*/
- void set_param(std::string param_name, double value);
+ void set_param(const std::string& param_name, double value);
/*! \brief Write a Swap2 instance to binary file.
*
@@ -257,7 +257,7 @@ public:
* \param mode: `string` Format of the file (can be either "HDF5"
* or "LGEACY". Default is "LEGACY").
*/
- void write_binary(std::string file_name, std::string mode="LEGACY");
+ void write_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Test whether two instances of Swap2 are equal.
*
@@ -321,7 +321,7 @@ protected:
* \return instance: `TFRFME *` Pointer to a new trapping configuration
* instance.
*/
- static TFRFME *from_hdf5(std::string file_name);
+ static TFRFME *from_hdf5(const std::string& file_name);
/*! \brief Load a configuration instance from a legacy binary file.
*
@@ -329,19 +329,19 @@ protected:
* \return instance: `TFRFME *` Pointer to a new trapping configuration
* instance.
*/
- static TFRFME *from_legacy(std::string file_name);
+ static TFRFME *from_legacy(const std::string& file_name);
/*! \brief Save a configuration instance to a HDF5 binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_hdf5(std::string file_name);
+ void write_hdf5(const std::string& file_name);
/*! \brief Save a configuration instance to a legacy binary file.
*
* \param file_name: `string` Name of the file to be written.
*/
- void write_legacy(std::string file_name);
+ void write_legacy(const std::string& file_name);
public:
/*! \brief Trapping configuration instance constructor.
@@ -369,7 +369,7 @@ public:
* \return instance: `TFRFME *` Pointer to a newly created configuration
* instance.
*/
- static TFRFME* from_binary(std::string file_name, std::string mode="LEGACY");
+ static TFRFME* from_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Get the pointer to the WSUM matrix.
*
@@ -397,7 +397,7 @@ public:
* \param param_name: `string` Name of the parameter.
* \return value: `double` The value of the requested parameter.
*/
- double get_param(std::string param_name);
+ double get_param(const std::string& param_name);
/*! \brief Get the pointer to the X coordinates vector.
*
@@ -422,7 +422,7 @@ public:
* \param param_name: `string` Name of the parameter.
* \param value: `double` Value to be stored as parameter.
*/
- void set_param(std::string param_name, double value);
+ void set_param(const std::string& param_name, double value);
/*! \brief Write a trapping configuration instance to binary file.
*
@@ -430,7 +430,7 @@ public:
* \param mode: `string` Format of the file (can be either "HDF5"
* or "LGEACY". Default is "LEGACY").
*/
- void write_binary(std::string file_name, std::string mode="LEGACY");
+ void write_binary(const std::string& file_name, const std::string& mode="LEGACY");
/*! \brief Test whether two instances of configuration are equal.
*
@@ -439,6 +439,6 @@ public:
* \return result: `bool` True, if the two instances are equal,
* false otherwise.
*/
- bool operator ==(TFRFME &other);
+ bool operator ==(const TFRFME& other);
};
#endif
diff --git a/src/libnptm/Configuration.cpp b/src/libnptm/Configuration.cpp
index 70e51d0749e53b6cbaba8147903f5cfd7b5794fc..23e38885d80afd9e39f1c10bc0e077891dc9b7b2 100644
--- a/src/libnptm/Configuration.cpp
+++ b/src/libnptm/Configuration.cpp
@@ -77,7 +77,7 @@ GeometryConfiguration::GeometryConfiguration(
sph_z = z;
}
-GeometryConfiguration::GeometryConfiguration(const GeometryConfiguration& rhs)
+GeometryConfiguration::GeometryConfiguration(const GeometryConfiguration& rhs)
{
number_of_spheres = rhs.number_of_spheres;
l_max = rhs.l_max;
@@ -118,7 +118,7 @@ GeometryConfiguration::~GeometryConfiguration() {
delete[] sph_z;
}
-GeometryConfiguration* GeometryConfiguration::from_legacy(string file_name) {
+GeometryConfiguration* GeometryConfiguration::from_legacy(const std::string& file_name) {
int num_lines = 0;
int last_read_line = 0;
string *file_lines;
@@ -233,7 +233,7 @@ GeometryConfiguration* GeometryConfiguration::from_legacy(string file_name) {
return conf;
}
-double GeometryConfiguration::get_param(std::string param_name) {
+double GeometryConfiguration::get_param(const std::string& param_name) {
double value;
if (param_name.compare("number_of_spheres") == 0) value = (double)number_of_spheres;
else if (param_name.compare("nsph") == 0) value = (double)number_of_spheres;
@@ -271,7 +271,7 @@ ScattererConfiguration::ScattererConfiguration(
int configs,
double *scale_vector,
int nxi,
- string variable_name,
+ const std::string& variable_name,
int *iog_vector,
double *ros_vector,
int *nshl_vector,
@@ -314,7 +314,7 @@ ScattererConfiguration::ScattererConfiguration(
}
}
-ScattererConfiguration::ScattererConfiguration(const ScattererConfiguration& rhs)
+ScattererConfiguration::ScattererConfiguration(const ScattererConfiguration& rhs)
{
number_of_spheres = rhs.number_of_spheres;
configurations = rhs.configurations;
@@ -372,7 +372,7 @@ ScattererConfiguration::~ScattererConfiguration() {
delete[] scale_vec;
}
-ScattererConfiguration* ScattererConfiguration::from_binary(string file_name, string mode) {
+ScattererConfiguration* ScattererConfiguration::from_binary(const std::string& file_name, const std::string& mode) {
ScattererConfiguration *conf = NULL;
if (mode.compare("LEGACY") == 0) {
conf = ScattererConfiguration::from_legacy(file_name);
@@ -385,7 +385,7 @@ ScattererConfiguration* ScattererConfiguration::from_binary(string file_name, st
return conf;
}
-ScattererConfiguration* ScattererConfiguration::from_dedfb(string dedfb_file_name) {
+ScattererConfiguration* ScattererConfiguration::from_dedfb(const std::string& dedfb_file_name) {
int num_lines = 0;
int last_read_line = 0;
string *file_lines;
@@ -648,7 +648,7 @@ ScattererConfiguration* ScattererConfiguration::from_dedfb(string dedfb_file_nam
return config;
}
-ScattererConfiguration* ScattererConfiguration::from_hdf5(string file_name) {
+ScattererConfiguration* ScattererConfiguration::from_hdf5(const std::string& file_name) {
ScattererConfiguration *conf = NULL;
unsigned int flags = H5F_ACC_RDONLY;
HDFFile *hdf_file = new HDFFile(file_name, flags);
@@ -745,7 +745,7 @@ ScattererConfiguration* ScattererConfiguration::from_hdf5(string file_name) {
return conf;
}
-ScattererConfiguration* ScattererConfiguration::from_legacy(string file_name) {
+ScattererConfiguration* ScattererConfiguration::from_legacy(const std::string& file_name) {
int _nsph;
int *_iog_vec;
int _ies;
@@ -832,7 +832,7 @@ ScattererConfiguration* ScattererConfiguration::from_legacy(string file_name) {
return conf;
}
-double ScattererConfiguration::get_param(string param_name) {
+double ScattererConfiguration::get_param(const std::string& param_name) {
double value;
if (param_name.compare("number_of_spheres") == 0) value = (double)number_of_spheres;
else if (param_name.compare("nsph") == 0) value = (double)number_of_spheres;
@@ -899,7 +899,7 @@ void ScattererConfiguration::print() {
printf(" ]\n");
}
-void ScattererConfiguration::write_binary(string file_name, string mode) {
+void ScattererConfiguration::write_binary(const std::string& file_name, const std::string& mode) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name);
} else if (mode.compare("HDF5") == 0) {
@@ -910,7 +910,7 @@ void ScattererConfiguration::write_binary(string file_name, string mode) {
}
}
-void ScattererConfiguration::write_hdf5(string file_name) {
+void ScattererConfiguration::write_hdf5(const std::string& file_name) {
int ies = (use_external_sphere)? 1 : 0;
List<string> *rec_name_list = new List<string>(1);
List<string> *rec_type_list = new List<string>(1);
@@ -1016,7 +1016,7 @@ void ScattererConfiguration::write_hdf5(string file_name) {
delete hdf_file;
}
-void ScattererConfiguration::write_legacy(string file_name) {
+void ScattererConfiguration::write_legacy(const std::string& file_name) {
fstream output;
int ies = (use_external_sphere)? 1 : 0;
output.open(file_name.c_str(), ios::out | ios::binary);
@@ -1062,7 +1062,7 @@ void ScattererConfiguration::write_legacy(string file_name) {
output.close();
}
-void ScattererConfiguration::write_formatted(string file_name) {
+void ScattererConfiguration::write_formatted(const std::string& file_name) {
const double evc = 6.5821188e-16;
const double two_pi = acos(0.0) * 4.0;
double *xi_vec;
@@ -1244,7 +1244,7 @@ void ScattererConfiguration::write_formatted(string file_name) {
fclose(output);
}
-bool ScattererConfiguration::operator ==(ScattererConfiguration &other) {
+bool ScattererConfiguration::operator ==(const ScattererConfiguration &other) {
if (number_of_spheres != other.number_of_spheres) {
return false;
}
diff --git a/src/libnptm/Parsers.cpp b/src/libnptm/Parsers.cpp
index 6c8326f7c4274258deb7f42bb16d47b050239bc9..8e6023e9cf76ef58639019da025fa0f7a7264b3f 100644
--- a/src/libnptm/Parsers.cpp
+++ b/src/libnptm/Parsers.cpp
@@ -19,7 +19,7 @@
#include "../include/Parsers.h"
#endif
-std::string *load_file(std::string file_name, int *count = 0) {
+std::string *load_file(const std::string& file_name, int *count = 0) {
std::fstream input_file(file_name.c_str(), std::ios::in);
List<std::string> *file_lines = new List<std::string>();
std::string line;
diff --git a/src/libnptm/TransitionMatrix.cpp b/src/libnptm/TransitionMatrix.cpp
index 477264ef52cb8ae311357a3179978c29c8d7c005..cb383e9f5ee58ce3d237e1f2dc869f7a3358f4f9 100644
--- a/src/libnptm/TransitionMatrix.cpp
+++ b/src/libnptm/TransitionMatrix.cpp
@@ -94,7 +94,7 @@ TransitionMatrix::TransitionMatrix(
}
}
-TransitionMatrix* TransitionMatrix::from_binary(std::string file_name, std::string mode) {
+TransitionMatrix* TransitionMatrix::from_binary(const std::string& file_name, const std::string& mode) {
TransitionMatrix *tm = NULL;
if (mode.compare("LEGACY") == 0) {
tm = TransitionMatrix::from_legacy(file_name);
@@ -107,7 +107,7 @@ TransitionMatrix* TransitionMatrix::from_binary(std::string file_name, std::stri
return tm;
}
-TransitionMatrix* TransitionMatrix::from_hdf5(std::string file_name) {
+TransitionMatrix* TransitionMatrix::from_hdf5(const std::string& file_name) {
TransitionMatrix *tm = NULL;
unsigned int flags = H5F_ACC_RDONLY;
HDFFile *hdf_file = new HDFFile(file_name, flags);
@@ -160,7 +160,7 @@ TransitionMatrix* TransitionMatrix::from_hdf5(std::string file_name) {
return tm;
}
-TransitionMatrix* TransitionMatrix::from_legacy(std::string file_name) {
+TransitionMatrix* TransitionMatrix::from_legacy(const std::string& file_name) {
fstream ttms;
TransitionMatrix *tm = NULL;
ttms.open(file_name, ios::binary | ios::in);
@@ -207,7 +207,7 @@ TransitionMatrix* TransitionMatrix::from_legacy(std::string file_name) {
return tm;
}
-void TransitionMatrix::write_binary(std::string file_name, std::string mode) {
+void TransitionMatrix::write_binary(const std::string& file_name, const std::string& mode) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name);
} else if (mode.compare("HDF5") == 0) {
@@ -219,8 +219,8 @@ void TransitionMatrix::write_binary(std::string file_name, std::string mode) {
}
void TransitionMatrix::write_binary(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
- double _exri, dcomplex **_am0m, std::string mode
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
+ double _exri, dcomplex **_am0m, const std::string& mode
) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name, _nlemt, _lm, _vk, _exri, _am0m);
@@ -233,9 +233,9 @@ void TransitionMatrix::write_binary(
}
void TransitionMatrix::write_binary(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius,
- std::string mode
+ const std::string& mode
) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name, _lm, _vk, _exri, _rmi, _rei, _sphere_radius);
@@ -247,7 +247,7 @@ void TransitionMatrix::write_binary(
}
}
-void TransitionMatrix::write_hdf5(std::string file_name) {
+void TransitionMatrix::write_hdf5(const std::string& file_name) {
if (is == 1 || is == 1111) {
List<string> rec_name_list(1);
List<string> rec_type_list(1);
@@ -298,7 +298,7 @@ void TransitionMatrix::write_hdf5(std::string file_name) {
}
void TransitionMatrix::write_hdf5(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
double _exri, dcomplex **_am0m
) {
int is = 1;
@@ -344,7 +344,7 @@ void TransitionMatrix::write_hdf5(
}
void TransitionMatrix::write_hdf5(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius
) {
int is = 1111;
@@ -394,7 +394,7 @@ void TransitionMatrix::write_hdf5(
delete hdf_file;
}
-void TransitionMatrix::write_legacy(std::string file_name) {
+void TransitionMatrix::write_legacy(const std::string& file_name) {
fstream ttms;
if (is == 1111 || is == 1) {
ttms.open(file_name, ios::binary | ios::out);
@@ -428,7 +428,7 @@ void TransitionMatrix::write_legacy(std::string file_name) {
}
void TransitionMatrix::write_legacy(
- std::string file_name, np_int _nlemt, int _lm, double _vk,
+ const std::string& file_name, np_int _nlemt, int _lm, double _vk,
double _exri, dcomplex **_am0m
) {
fstream ttms;
@@ -455,7 +455,7 @@ void TransitionMatrix::write_legacy(
}
void TransitionMatrix::write_legacy(
- std::string file_name, int _lm, double _vk, double _exri,
+ const std::string& file_name, int _lm, double _vk, double _exri,
dcomplex **_rmi, dcomplex **_rei, double _sphere_radius
) {
fstream ttms;
diff --git a/src/libnptm/file_io.cpp b/src/libnptm/file_io.cpp
index 1771ffa95921307b78d836f1add066f097916e54..c196d515e3923a5045373e28ce144c5a1e5de4c1 100644
--- a/src/libnptm/file_io.cpp
+++ b/src/libnptm/file_io.cpp
@@ -21,7 +21,7 @@
using namespace std;
-FileSchema::FileSchema(int num_rec, string *rec_types, string *rec_names) {
+FileSchema::FileSchema(int num_rec, const std::string *rec_types, const std::string *rec_names) {
num_records = num_rec;
record_types = new string[num_rec];
record_names = new string[num_rec];
@@ -49,7 +49,7 @@ string* FileSchema::get_record_types() {
return rec_types;
}
-HDFFile::HDFFile(string name, unsigned int flags, hid_t fcpl_id, hid_t fapl_id) {
+HDFFile::HDFFile(const std::string& name, unsigned int flags, hid_t fcpl_id, hid_t fapl_id) {
file_name = name;
if (flags == H5F_ACC_EXCL || flags == H5F_ACC_TRUNC)
file_id = H5Fcreate(name.c_str(), flags, fcpl_id, fapl_id);
@@ -73,7 +73,7 @@ herr_t HDFFile::close() {
}
HDFFile* HDFFile::from_schema(
- FileSchema &schema, string name, unsigned int flags,
+ FileSchema &schema, const std::string& name, unsigned int flags,
hid_t fcpl_id, hid_t fapl_id
) {
HDFFile *hdf_file = new HDFFile(name, flags, fcpl_id, fapl_id);
@@ -144,9 +144,9 @@ HDFFile* HDFFile::from_schema(
}
herr_t HDFFile::read(
- string dataset_name, string data_type, void *buffer,
- hid_t mem_space_id, hid_t file_space_id, hid_t dapl_id,
- hid_t dxpl_id
+ const std::string& dataset_name, const std::string& data_type, void *buffer,
+ hid_t mem_space_id, hid_t file_space_id, hid_t dapl_id,
+ hid_t dxpl_id
) {
string known_types[] = {"INT32", "FLOAT64"};
regex re;
@@ -183,7 +183,7 @@ herr_t HDFFile::read(
}
herr_t HDFFile::write(
- string dataset_name, string data_type, const void *buffer,
+ const std::string& dataset_name, const std::string& data_type, const void *buffer,
hid_t mem_space_id, hid_t file_space_id, hid_t dapl_id,
hid_t dxpl_id
) {
diff --git a/src/libnptm/logging.cpp b/src/libnptm/logging.cpp
index fbf96725e621c856a9937855ced71a8268fc848b..a0246ceb75236840cf6323c0b85c4dd12714bac9 100644
--- a/src/libnptm/logging.cpp
+++ b/src/libnptm/logging.cpp
@@ -25,7 +25,7 @@ Logger::~Logger() {
delete last_message;
}
-void Logger::err(std::string message) {
+void Logger::err(const std::string& message) {
#pragma omp critical
{
fprintf(err_output, "%s", message.c_str());
@@ -52,7 +52,7 @@ void Logger::flush(int level) {
}
}
-void Logger::log(std::string message, int level) {
+void Logger::log(const std::string& message, int level) {
#pragma omp critical
{
if (level == LOG_ERRO) err(message);
@@ -65,7 +65,7 @@ void Logger::log(std::string message, int level) {
}
}
-void Logger::push(std::string message) {
+void Logger::push(const std::string& message) {
#pragma omp critical
{
if (repetitions > 0) {
diff --git a/src/libnptm/tfrfme.cpp b/src/libnptm/tfrfme.cpp
index a1a8e1aecf19841471964057b2d3442711638e82..081563e3ff10777d893dd6af051c26ae18c5d87a 100644
--- a/src/libnptm/tfrfme.cpp
+++ b/src/libnptm/tfrfme.cpp
@@ -41,7 +41,7 @@ Swap1::Swap1(int lm, int _nkv) {
last_index = 0;
}
-Swap1* Swap1::from_binary(string file_name, string mode) {
+Swap1* Swap1::from_binary(const std::string& file_name, const std::string& mode) {
Swap1 *instance = NULL;
if (mode.compare("LEGACY") == 0) {
instance = from_legacy(file_name);
@@ -54,7 +54,7 @@ Swap1* Swap1::from_binary(string file_name, string mode) {
return instance;
}
-Swap1* Swap1::from_hdf5(string file_name) {
+Swap1* Swap1::from_hdf5(const std::string& file_name) {
Swap1 *instance = NULL;
unsigned int flags = H5F_ACC_RDONLY;
HDFFile *hdf_file = new HDFFile(file_name, flags);
@@ -86,7 +86,7 @@ Swap1* Swap1::from_hdf5(string file_name) {
return instance;
}
-Swap1* Swap1::from_legacy(string file_name) {
+Swap1* Swap1::from_legacy(const std::string& file_name) {
fstream input;
Swap1 *instance = NULL;
dcomplex *_wk = NULL;
@@ -118,7 +118,7 @@ long Swap1::get_memory_requirement(int lm, int _nkv) {
return size;
}
-void Swap1::write_binary(string file_name, string mode) {
+void Swap1::write_binary(const std::string& file_name, const std::string& mode) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name);
} else if (mode.compare("HDF5") == 0) {
@@ -129,7 +129,7 @@ void Swap1::write_binary(string file_name, string mode) {
}
}
-void Swap1::write_hdf5(string file_name) {
+void Swap1::write_hdf5(const std::string& file_name) {
List<string> rec_name_list(1);
List<string> rec_type_list(1);
List<void *> rec_ptr_list(1);
@@ -169,7 +169,7 @@ void Swap1::write_hdf5(string file_name) {
delete hdf_file;
}
-void Swap1::write_legacy(string file_name) {
+void Swap1::write_legacy(const std::string& file_name) {
fstream output;
double rval, ival;
output.open(file_name.c_str(), ios::out | ios::binary);
@@ -222,7 +222,7 @@ Swap2::~Swap2() {
delete[] vkzm;
}
-Swap2* Swap2::from_binary(string file_name, string mode) {
+Swap2* Swap2::from_binary(const std::string& file_name, const std::string& mode) {
Swap2 *instance = NULL;
if (mode.compare("LEGACY") == 0) {
instance = from_legacy(file_name);
@@ -235,7 +235,7 @@ Swap2* Swap2::from_binary(string file_name, string mode) {
return instance;
}
-Swap2* Swap2::from_hdf5(string file_name) {
+Swap2* Swap2::from_hdf5(const std::string& file_name) {
Swap2 *instance = NULL;
unsigned int flags = H5F_ACC_RDONLY;
HDFFile *hdf_file = new HDFFile(file_name, flags);
@@ -282,7 +282,7 @@ Swap2* Swap2::from_hdf5(string file_name) {
return instance;
}
-Swap2* Swap2::from_legacy(string file_name) {
+Swap2* Swap2::from_legacy(const std::string& file_name) {
fstream input;
Swap2 *instance = NULL;
int _nkv, _nlmmt, _nrvc;
@@ -344,7 +344,7 @@ long Swap2::get_memory_requirement(int _nkv) {
return size;
}
-double Swap2::get_param(string param_name) {
+double Swap2::get_param(const std::string& param_name) {
double value;
if (param_name.compare("nkv") == 0) value = 1.0 * nkv;
else if (param_name.compare("apfafa") == 0) value = apfafa;
@@ -374,7 +374,7 @@ void Swap2::push_matrix(double value) {
last_matrix++;
}
-void Swap2::set_param(string param_name, double value) {
+void Swap2::set_param(const std::string& param_name, double value) {
if (param_name.compare("nkv") == 0) nkv = (int)value;
else if (param_name.compare("apfafa") == 0) apfafa = value;
else if (param_name.compare("pmf") == 0) pmf = value;
@@ -395,7 +395,7 @@ void Swap2::set_param(string param_name, double value) {
}
}
-void Swap2::write_binary(string file_name, string mode) {
+void Swap2::write_binary(const std::string& file_name, const std::string& mode) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name);
} else if (mode.compare("HDF5") == 0) {
@@ -406,7 +406,7 @@ void Swap2::write_binary(string file_name, string mode) {
}
}
-void Swap2::write_hdf5(string file_name) {
+void Swap2::write_hdf5(const std::string& file_name) {
List<string> rec_name_list(1);
List<string> rec_type_list(1);
List<void *> rec_ptr_list(1);
@@ -479,7 +479,7 @@ void Swap2::write_hdf5(string file_name) {
delete hdf_file;
}
-void Swap2::write_legacy(string file_name) {
+void Swap2::write_legacy(const std::string& file_name) {
fstream output;
double value;
output.open(file_name.c_str(), ios::out | ios::binary);
@@ -608,7 +608,7 @@ TFRFME::~TFRFME() {
delete[] wsum;
}
-TFRFME* TFRFME::from_binary(string file_name, string mode) {
+TFRFME* TFRFME::from_binary(const std::string& file_name, const std::string& mode) {
TFRFME *instance = NULL;
if (mode.compare("LEGACY") == 0) {
instance = from_legacy(file_name);
@@ -621,7 +621,7 @@ TFRFME* TFRFME::from_binary(string file_name, string mode) {
return instance;
}
-TFRFME* TFRFME::from_hdf5(string file_name) {
+TFRFME* TFRFME::from_hdf5(const std::string& file_name) {
TFRFME *instance = NULL;
unsigned int flags = H5F_ACC_RDONLY;
HDFFile *hdf_file = new HDFFile(file_name, flags);
@@ -685,7 +685,7 @@ TFRFME* TFRFME::from_hdf5(string file_name) {
return instance;
}
-TFRFME* TFRFME::from_legacy(string file_name) {
+TFRFME* TFRFME::from_legacy(const std::string& file_name) {
fstream input;
TFRFME *instance = NULL;
dcomplex **_wsum = NULL;
@@ -763,7 +763,7 @@ long TFRFME::get_memory_requirement(
return size;
}
-double TFRFME::get_param(string param_name) {
+double TFRFME::get_param(const std::string& param_name) {
double value;
if (param_name.compare("vk") == 0) value = vk;
else if (param_name.compare("exri") == 0) value = exri;
@@ -786,7 +786,7 @@ double TFRFME::get_param(string param_name) {
return value;
}
-void TFRFME::set_param(string param_name, double value) {
+void TFRFME::set_param(const std::string& param_name, double value) {
if (param_name.compare("vk") == 0) vk = value;
else if (param_name.compare("exri") == 0) exri = value;
else if (param_name.compare("an") == 0) an = value;
@@ -801,7 +801,7 @@ void TFRFME::set_param(string param_name, double value) {
}
}
-void TFRFME::write_binary(string file_name, string mode) {
+void TFRFME::write_binary(const std::string& file_name, const std::string& mode) {
if (mode.compare("LEGACY") == 0) {
write_legacy(file_name);
} else if (mode.compare("HDF5") == 0) {
@@ -812,7 +812,7 @@ void TFRFME::write_binary(string file_name, string mode) {
}
}
-void TFRFME::write_hdf5(string file_name) {
+void TFRFME::write_hdf5(const std::string& file_name) {
List<string> rec_name_list(1);
List<string> rec_type_list(1);
List<void *> rec_ptr_list(1);
@@ -905,7 +905,7 @@ void TFRFME::write_hdf5(string file_name) {
delete hdf_file;
}
-void TFRFME::write_legacy(string file_name) {
+void TFRFME::write_legacy(const std::string& file_name) {
fstream output;
output.open(file_name.c_str(), ios::out | ios::binary);
if (output.is_open()) {
@@ -943,7 +943,7 @@ void TFRFME::write_legacy(string file_name) {
}
}
-bool TFRFME::operator ==(TFRFME &other) {
+bool TFRFME::operator ==(const TFRFME& other) {
if (lmode != other.lmode) {
return false;
}