Cleanup in IntensityFunctions

Core/Instrument/IIntensityFunction.cpp

@@ -16,12 +16,19 @@
 #include <cmath>
 #include <limits>
 
+IIntensityFunction::~IIntensityFunction() = default;
+
+IntensityFunctionLog* IntensityFunctionLog::clone() const { return new IntensityFunctionLog; }
+
 double IntensityFunctionLog::evaluate(double value) const
 {
     return value > 0 ? std::log(value) : std::numeric_limits<double>::lowest();
 }
 
+IntensityFunctionSqrt* IntensityFunctionSqrt::clone() const { return new IntensityFunctionSqrt; }
+
 double IntensityFunctionSqrt::evaluate(double value) const
 {
     return value > 0 ? std::sqrt(value) : std::numeric_limits<double>::lowest();
 }
+

Core/Instrument/IIntensityFunction.h

@@ -24,7 +24,7 @@
 class BA_CORE_API_ IIntensityFunction
 {
 public:
-    virtual ~IIntensityFunction() {}
+    virtual ~IIntensityFunction();
     virtual IIntensityFunction *clone() const =0;
     virtual double evaluate(double value) const =0;
 };
@@ -36,8 +36,7 @@ public:
 class BA_CORE_API_ IntensityFunctionLog : public IIntensityFunction
 {
 public:
-    virtual ~IntensityFunctionLog() {}
-    virtual IntensityFunctionLog *clone() const { return new IntensityFunctionLog(); }
+    virtual IntensityFunctionLog *clone() const;
     virtual double evaluate(double value) const;
 };
 
@@ -48,8 +47,7 @@ public:
 class BA_CORE_API_ IntensityFunctionSqrt : public IIntensityFunction
 {
 public:
-    virtual ~IntensityFunctionSqrt() {}
-    virtual IntensityFunctionSqrt *clone() const { return new IntensityFunctionSqrt(); }
+    virtual IntensityFunctionSqrt *clone() const;
     virtual double evaluate(double value) const;
 };
 

Core/Instrument/VarianceFunctions.h

@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef IVARIANCEFUNCTION_H
-#define IVARIANCEFUNCTION_H
+#ifndef VARIANCEFUNCTIONS_H
+#define VARIANCEFUNCTIONS_H
 
 #include "WinDllMacros.h"
 
@@ -56,4 +56,4 @@ private:
     double m_epsilon;
 };
 
-#endif // IVARIANCEFUNCTION_H
+#endif // VARIANCEFUNCTIONS_H