From 8afc5d2be3431ec876694c67c0654dc44703953a Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Fri, 3 May 2013 17:05:40 +0200
Subject: [PATCH] Fixed some compilation issues and moved source file
---
Core/Algorithms/inc/SpecularMatrix.h | 6 ++++--
{App => Core/Algorithms}/src/SpecularMatrix.cpp | 0
Core/Core.pro | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
rename {App => Core/Algorithms}/src/SpecularMatrix.cpp (100%)
diff --git a/Core/Algorithms/inc/SpecularMatrix.h b/Core/Algorithms/inc/SpecularMatrix.h
index 20daac5f923..56bf891bc3c 100644
--- a/Core/Algorithms/inc/SpecularMatrix.h
+++ b/Core/Algorithms/inc/SpecularMatrix.h
@@ -17,6 +17,8 @@
#define SPECULARMATRIX_H_
#include "Types.h"
+#include "ISimulation.h"
+#include "MultiLayer.h"
//! Implements the matrix formalism for the calculation of wave amplitudes of
//! the coherent wave solution in a multilayer
@@ -50,13 +52,13 @@ public:
inline size_t size() const { return m_data.size(); }
inline void clear() { m_data.clear(); }
inline void resize(size_t size) { m_data.resize(size); }
- private:
- std::vector<LayerMatrixCoeff > m_data;
complex_t R; // total reflection coefficient
complex_t L11;
complex_t L12;
complex_t L21;
complex_t L22;
+ private:
+ std::vector<LayerMatrixCoeff > m_data;
};
typedef MultiLayerMatrixCoeff MultiLayerCoeff_t; // set of layer coefficients for matrix formalism
diff --git a/App/src/SpecularMatrix.cpp b/Core/Algorithms/src/SpecularMatrix.cpp
similarity index 100%
rename from App/src/SpecularMatrix.cpp
rename to Core/Algorithms/src/SpecularMatrix.cpp
diff --git a/Core/Core.pro b/Core/Core.pro
index 4e5d541cffe..fead580a35e 100644
--- a/Core/Core.pro
+++ b/Core/Core.pro
@@ -72,6 +72,7 @@ SOURCES += \
Algorithms/src/ResolutionFunction2DSimple.cpp \
Algorithms/src/Simulation.cpp \
Algorithms/src/SizeSpacingCorrelationApproximationStrategy.cpp \
+ Algorithms/src/SpecularMatrix.cpp \
Algorithms/src/StrategyBuilder.cpp \
\
FormFactors/src/FormFactorBox.cpp \
@@ -219,6 +220,7 @@ HEADERS += \
Algorithms/inc/Simulation.h \
Algorithms/inc/SimulationParameters.h \
Algorithms/inc/SizeSpacingCorrelationApproximationStrategy.h \
+ Algorithms/inc/SpecularMatrix.h \
Algorithms/inc/StrategyBuilder.h \
Algorithms/inc/ThreadInfo.h \
\
--
GitLab