Skip to content
Snippets Groups Projects
Commit 8eaa510e authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Fixed functional tests for python script generation

parent 8638c3c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Core/Tools/inc/Compare.h deleted 100644 → 0
+ 0
− 59
View file @ 8638c3c0
// ************************************************************************** //
//
// BornAgain: simulate and fit scattering at grazing incidence
//
//! @file Tools/inc/Compare.h
//! @brief Defines class Compare
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2015
//! @authors Scientific Computing Group at MLZ Garching
//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
#ifndef COMPARE_H
#define COMPARE_H
#include<iostream>
#include "FormFactors.h"
#include "Materials.h"
#include "IParticle.h"
#include "ParticleLayout.h"
#include "ParticleInfo.h"
class Compare
{
public:
Compare();
bool compareFormFactor(const IFormFactor *iFormFactor1, const IFormFactor *iFormFactor2);
bool compareFormFactorAnisoPyramid(const FormFactorAnisoPyramid *a, const FormFactorAnisoPyramid *b);
bool compareFormFactorBox(const FormFactorBox *a,const FormFactorBox *b);
bool compareFormFactorCone(const FormFactorCone *a,const FormFactorCone *b);
bool compareFormFactorCone6(const FormFactorCone6 *a,const FormFactorCone6 *b);
bool compareFormFactorCuboctahedron(const FormFactorCuboctahedron *a,const FormFactorCuboctahedron *b);
bool compareFormFactorCylinder(const FormFactorCylinder *a,const FormFactorCylinder *b);
bool compareFormFactorEllipsoidalCylinder(const FormFactorEllipsoidalCylinder *a,const FormFactorEllipsoidalCylinder *b);
bool compareFormFactorFullSphere(const FormFactorFullSphere *a,const FormFactorFullSphere *b);
bool compareFormFactorFullSpheroid(const FormFactorFullSpheroid *a,const FormFactorFullSpheroid *b);
bool compareFormFactorGauss(const FormFactorGauss *a,const FormFactorGauss *b);
bool compareFormFactorHemiEllipsoid(const FormFactorHemiEllipsoid *a,const FormFactorHemiEllipsoid *b);
bool compareFormFactorInfLongBox(const FormFactorInfLongBox *a,const FormFactorInfLongBox *b);
bool compareFormFactorInfLongRipple1(const FormFactorInfLongRipple1 *a,const FormFactorInfLongRipple1 *b);
bool compareFormFactorInfLongRipple2(const FormFactorInfLongRipple2 *a,const FormFactorInfLongRipple2 *b);
bool compareFormFactorLorrentz(const FormFactorLorentz *a,const FormFactorLorentz *b);
bool compareFormFactorPrism3(const FormFactorPrism3 *a,const FormFactorPrism3 *b);
bool compareFormFactorPrism6(const FormFactorPrism6 *a,const FormFactorPrism6 *b);
bool compareFormFactorPyramid(const FormFactorPyramid *a,const FormFactorPyramid *b);
bool compareFormFactorRipple1(const FormFactorRipple1 *a,const FormFactorRipple1 *b);
bool compareFormFactorRipple2(const FormFactorRipple2 *a,const FormFactorRipple2 *b);
bool compareFormFactorTetrahedron(const FormFactorTetrahedron *a,const FormFactorTetrahedron *b);
bool compareFormFactorTruncatedSphere(const FormFactorTruncatedSphere *a,const FormFactorTruncatedSphere *b);
bool compareFormFactorTruncatedSpheroid(const FormFactorTruncatedSpheroid *a,const FormFactorTruncatedSpheroid *b);
bool compareMaterial(const IMaterial *a,const IMaterial *b);
bool compareParticle(const IParticle *a,const IParticle *b);
bool compareParticleLayout(const ParticleLayout *a, const ParticleLayout *b);
};
#endif // COMPARE_H
Core/Tools/src/Compare.cpp deleted 100644 → 0
+ 0
− 453
View file @ 8638c3c0
// ************************************************************************** //
//
// BornAgain: simulate and fit scattering at grazing incidence
//
//! @file Tools/src/Compare.cpp
//! @brief Implement class Compare.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2015
//! @authors Scientific Computing Group at MLZ Garching
//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
#include "Compare.h"
Compare::Compare()
{
}
bool Compare::compareFormFactor(const IFormFactor *iFormFactor1, const IFormFactor *iFormFactor2)
{
if (const FormFactorAnisoPyramid *a = dynamic_cast<const FormFactorAnisoPyramid *>(iFormFactor1))
{
if (const FormFactorAnisoPyramid *b = dynamic_cast<const FormFactorAnisoPyramid *>(iFormFactor2))
return compareFormFactorAnisoPyramid(a,b);
else
return 0;
}
else if (const FormFactorBox *c = dynamic_cast<const FormFactorBox *>(iFormFactor1))
{
if (const FormFactorBox *d = dynamic_cast<const FormFactorBox *>(iFormFactor2))
return compareFormFactorBox(c,d);
else
return 0;
}
else if (const FormFactorCone *a = dynamic_cast<const FormFactorCone *>(iFormFactor1))
{
if (const FormFactorCone *b = dynamic_cast<const FormFactorCone *>(iFormFactor2))
return compareFormFactorCone(a,b);
else
return 0;
}
else if (const FormFactorCone6 *a = dynamic_cast<const FormFactorCone6 *>(iFormFactor1))
{
if (const FormFactorCone6 *b = dynamic_cast<const FormFactorCone6 *>(iFormFactor2))
return compareFormFactorCone6(a,b);
else
return 0;
}
else if (const FormFactorCuboctahedron *a = dynamic_cast<const FormFactorCuboctahedron *>(iFormFactor1))
{
if (const FormFactorCuboctahedron *b = dynamic_cast<const FormFactorCuboctahedron *>(iFormFactor2))
return compareFormFactorCuboctahedron(a,b);
else
return 0;
}
else if (const FormFactorCylinder *a = dynamic_cast<const FormFactorCylinder *>(iFormFactor1))
{
if (const FormFactorCylinder *b = dynamic_cast<const FormFactorCylinder *>(iFormFactor2))
return compareFormFactorCylinder(a,b);
else
return 0;
}
else if (const FormFactorEllipsoidalCylinder *a = dynamic_cast<const FormFactorEllipsoidalCylinder *>(iFormFactor1))
{
if (const FormFactorEllipsoidalCylinder *b = dynamic_cast<const FormFactorEllipsoidalCylinder *>(iFormFactor2))
return compareFormFactorEllipsoidalCylinder(a,b);
else
return 0;
}
else if (const FormFactorFullSphere *a = dynamic_cast<const FormFactorFullSphere *>(iFormFactor1))
{
if (const FormFactorFullSphere *b = dynamic_cast<const FormFactorFullSphere *>(iFormFactor2))
return compareFormFactorFullSphere(a,b);
else
return 0;
}
else if (const FormFactorFullSpheroid *a = dynamic_cast<const FormFactorFullSpheroid *>(iFormFactor1))
{
if (const FormFactorFullSpheroid *b = dynamic_cast<const FormFactorFullSpheroid *>(iFormFactor2))
return compareFormFactorFullSpheroid(a,b);
else
return 0;
}
else if (const FormFactorGauss *a = dynamic_cast<const FormFactorGauss *>(iFormFactor1))
{
if (const FormFactorGauss *b = dynamic_cast<const FormFactorGauss *>(iFormFactor2))
return compareFormFactorGauss(a,b);
else
return 0;
}
else if (const FormFactorHemiEllipsoid *a = dynamic_cast<const FormFactorHemiEllipsoid *>(iFormFactor1))
{
if (const FormFactorHemiEllipsoid *b = dynamic_cast<const FormFactorHemiEllipsoid *>(iFormFactor2))
return compareFormFactorHemiEllipsoid(a,b);
else
return 0;
}
else if (const FormFactorInfLongBox *a = dynamic_cast<const FormFactorInfLongBox *>(iFormFactor1))
{
if (const FormFactorInfLongBox *b = dynamic_cast<const FormFactorInfLongBox *>(iFormFactor2))
return compareFormFactorInfLongBox(a,b);
else
return 0;
}
else if (const FormFactorInfLongRipple1 *a = dynamic_cast<const FormFactorInfLongRipple1 *>(iFormFactor1))
{
if (const FormFactorInfLongRipple1 *b = dynamic_cast<const FormFactorInfLongRipple1 *>(iFormFactor2))
return compareFormFactorInfLongRipple1(a,b);
else
return 0;
}
else if (const FormFactorInfLongRipple2 *a = dynamic_cast<const FormFactorInfLongRipple2 *>(iFormFactor1))
{
if (const FormFactorInfLongRipple2 *b = dynamic_cast<const FormFactorInfLongRipple2 *>(iFormFactor2))
return compareFormFactorInfLongRipple2(a,b);
else
return 0;
}
else if (const FormFactorLorentz *a = dynamic_cast<const FormFactorLorentz *>(iFormFactor1))
{
if (const FormFactorLorentz *b = dynamic_cast<const FormFactorLorentz *>(iFormFactor2))
return compareFormFactorLorrentz(a,b);
else
return 0;
}
else if (const FormFactorPrism3 *a = dynamic_cast<const FormFactorPrism3 *>(iFormFactor1))
{
if (const FormFactorPrism3 *b = dynamic_cast<const FormFactorPrism3 *>(iFormFactor2))
return compareFormFactorPrism3(a,b);
else
return 0;
}
else if (const FormFactorPrism6 *a = dynamic_cast<const FormFactorPrism6 *>(iFormFactor1))
{
if (const FormFactorPrism6 *b = dynamic_cast<const FormFactorPrism6 *>(iFormFactor2))
return compareFormFactorPrism6(a,b);
else
return 0;
}
else if (const FormFactorPyramid *a = dynamic_cast<const FormFactorPyramid *>(iFormFactor1))
{
if (const FormFactorPyramid *b = dynamic_cast<const FormFactorPyramid *>(iFormFactor2))
return compareFormFactorPyramid(a,b);
else
return 0;
}
else if (const FormFactorRipple1 *a = dynamic_cast<const FormFactorRipple1 *>(iFormFactor1))
{
if (const FormFactorRipple1 *b = dynamic_cast<const FormFactorRipple1 *>(iFormFactor2))
return compareFormFactorRipple1(a,b);
else
return 0;
}
else if (const FormFactorRipple2 *a = dynamic_cast<const FormFactorRipple2 *>(iFormFactor1))
{
if (const FormFactorRipple2 *b = dynamic_cast<const FormFactorRipple2 *>(iFormFactor2))
return compareFormFactorRipple2(a,b);
else
return 0;
}
else if (const FormFactorTetrahedron *a = dynamic_cast<const FormFactorTetrahedron *>(iFormFactor1))
{
if (const FormFactorTetrahedron *b = dynamic_cast<const FormFactorTetrahedron *>(iFormFactor2))
return compareFormFactorTetrahedron(a,b);
else
return 0;
}
else if (const FormFactorTruncatedSphere *a = dynamic_cast<const FormFactorTruncatedSphere *>(iFormFactor1))
{
if (const FormFactorTruncatedSphere *b = dynamic_cast<const FormFactorTruncatedSphere *>(iFormFactor2))
return compareFormFactorTruncatedSphere(a,b);
else
return 0;
}
else if (const FormFactorTruncatedSpheroid *a = dynamic_cast<const FormFactorTruncatedSpheroid *>(iFormFactor1))
{
if (const FormFactorTruncatedSpheroid *b = dynamic_cast<const FormFactorTruncatedSpheroid *>(iFormFactor2))
return compareFormFactorTruncatedSpheroid(a,b);
else
return 0;
}
else
return 0;
//We should implement return of Exception here
}
bool Compare::compareFormFactorAnisoPyramid(const FormFactorAnisoPyramid *a, const FormFactorAnisoPyramid *b)
{
if(a->getLength() == b->getLength() && a->getWidth() == b->getWidth()
&& a->getHeight() == b->getHeight() && a->getAlpha() == b->getAlpha())
return 1;
else
return 0;
}
bool Compare::compareFormFactorBox(const FormFactorBox *a,const FormFactorBox *b)
{
if(a->getLength() == b->getLength() && a->getWidth() == b->getWidth()
&& a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorCone(const FormFactorCone *a,const FormFactorCone *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight()
&& a->getAlpha() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorCone6(const FormFactorCone6 *a,const FormFactorCone6 *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight()
&& a->getAlpha() == b->getAlpha())
return 1;
else
return 0;
}
bool Compare::compareFormFactorCuboctahedron(const FormFactorCuboctahedron *a,const FormFactorCuboctahedron *b)
{
if(a->getLength() == b->getLength() && a->getHeight() == b->getHeight()
&& a->getHeightRatio() == b->getHeightRatio() && a->getAlpha() == b->getAlpha())
return 1;
else
return 0;
}
bool Compare::compareFormFactorCylinder(const FormFactorCylinder *a,const FormFactorCylinder *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorEllipsoidalCylinder(const FormFactorEllipsoidalCylinder *a,const FormFactorEllipsoidalCylinder *b)
{
if(a->getRadiusA() == b->getRadiusA() && a->getRadiusB() == b->getRadiusB()
&& a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorFullSphere(const FormFactorFullSphere *a,const FormFactorFullSphere *b)
{
if(a->getRadius() == b->getRadius())
return 1;
else
return 0;
}
bool Compare::compareFormFactorFullSpheroid(const FormFactorFullSpheroid *a,const FormFactorFullSpheroid *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorGauss(const FormFactorGauss *a,const FormFactorGauss *b)
{
if(a->getRadius() == b->getRadius() && a->getRadius() == b->getRadius())
return 1;
else
return 0;
}
bool Compare::compareFormFactorHemiEllipsoid(const FormFactorHemiEllipsoid *a,const FormFactorHemiEllipsoid *b)
{
if(a->getRadiusA() == b->getRadiusA() && a->getRadiusB() == b->getRadiusB()
&& b->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorInfLongBox(const FormFactorInfLongBox *a,const FormFactorInfLongBox *b)
{
if(a->getWidth() == b->getWidth() && a->getHeight() == b->getWidth())
return 1;
else
return 0;
}
bool Compare::compareFormFactorInfLongRipple1(const FormFactorInfLongRipple1 *a,const FormFactorInfLongRipple1 *b)
{
if(a->getWidth() == b->getWidth() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorInfLongRipple2(const FormFactorInfLongRipple2 *a,const FormFactorInfLongRipple2 *b)
{
if(a->getWidth() == b->getWidth() && a->getHeight() == b->getHeight()
&& a->getAsymetry() == b->getAsymetry())
return 1;
else
return 0;
}
bool Compare::compareFormFactorLorrentz(const FormFactorLorentz *a,const FormFactorLorentz *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorPrism3(const FormFactorPrism3 *a,const FormFactorPrism3 *b)
{
if(a->getLength() == b->getLength() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorPrism6(const FormFactorPrism6 *a,const FormFactorPrism6 *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorPyramid(const FormFactorPyramid *a,const FormFactorPyramid *b)
{
if(a->getLength() == b->getLength() && a->getHeight() == b->getHeight()
&& a->getAlpha() == b->getAlpha())
return 1;
else
return 0;
}
bool Compare::compareFormFactorRipple1(const FormFactorRipple1 *a,const FormFactorRipple1 *b)
{
if(a->getLength() == b->getLength() && a->getWidth() == b->getWidth()
&& a->getHeight() == b->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorRipple2(const FormFactorRipple2 *a,const FormFactorRipple2 *b)
{
if(a->getLength() == b->getLength() && a->getWidth() == b->getWidth()
&& a->getHeight() == b->getHeight() && a->getAsymmetry() == b->getAsymmetry())
return 1;
else
return 0;
}
bool Compare::compareFormFactorTetrahedron(const FormFactorTetrahedron *a,const FormFactorTetrahedron *b)
{
if(a->getLength() == b->getLength() && a->getHeight() == b->getHeight()
&& a->getAlpha() == b->getAlpha())
return 1;
else
return 0;
}
bool Compare::compareFormFactorTruncatedSphere(const FormFactorTruncatedSphere *a,const FormFactorTruncatedSphere *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight())
return 1;
else
return 0;
}
bool Compare::compareFormFactorTruncatedSpheroid(const FormFactorTruncatedSpheroid *a,const FormFactorTruncatedSpheroid *b)
{
if(a->getRadius() == b->getRadius() && a->getHeight() == b->getHeight()
&& a->getHeightFlattening() == b->getHeightFlattening())
return 1;
else
return 0;
}
bool Compare::compareMaterial(const IMaterial *a,const IMaterial *b)
{
if(a->getRefractiveIndex() == b->getRefractiveIndex() && a->getName() == b->getName())
return 1;
else
return 0;
}
bool Compare::compareParticle(const IParticle *a,const IParticle *b)
{
// if (compareFormFactor(a->getSimpleFormFactor(),b->getSimpleFormFactor()) == 1)
// return 1;
// else
return 0;
}
bool Compare::compareParticleLayout(const ParticleLayout *a,const ParticleLayout *b)
{
bool check = 1;
size_t aParticles = a->getNumberOfParticles();
size_t bParticles = a->getNumberOfParticles();
if (aParticles != bParticles)
{
check = 0;
}
size_t particleIndex = 0;
while (particleIndex != aParticles && check == 1)
{
const ParticleInfo *aInfo = a->getParticleInfo(particleIndex);
const ParticleInfo *bInfo = b->getParticleInfo(particleIndex);
if(aInfo->getAbundance() != bInfo->getAbundance()
|| aInfo->getDepth() != bInfo->getDepth()
|| compareParticle(aInfo->getParticle(),bInfo->getParticle()) != 1)
{
check = 0;
}
}
if (check == 1)
return 1;
else
return 0;
}
Core/Tools/src/OutputDataReader.cpp
+ 6
− 3
View file @ 8eaa510e
...@@ -43,7 +43,8 @@ OutputDataReader::~OutputDataReader() ...@@ -43,7 +43,8 @@ OutputDataReader::~OutputDataReader()
OutputData<double > *OutputDataReader::getOutputData() OutputData<double > *OutputDataReader::getOutputData()
{ {
if(!m_read_strategy) { if(!m_read_strategy) {
throw NullPointerException("OutputDataReader::getOutputData() -> Error! No read strategy defined"); throw NullPointerException("OutputDataReader::getOutputData() ->"
" Error! No read strategy defined");
} }
// opening file // opening file
...@@ -54,10 +55,12 @@ OutputData<double > *OutputDataReader::getOutputData() ...@@ -54,10 +55,12 @@ OutputData<double > *OutputDataReader::getOutputData()
fin.open(m_file_name.c_str(), openmode ); fin.open(m_file_name.c_str(), openmode );
if( !fin.is_open() ) { if( !fin.is_open() ) {
throw FileNotIsOpenException("OutputDataReader::getOutputData() -> Error. Can't open file '"+m_file_name+"' for reading."); throw FileNotIsOpenException("OutputDataReader::getOutputData() -> Error. Can't open file '"
+ m_file_name + "' for reading.");
} }
if ( !fin.good() ) { if ( !fin.good() ) {
throw FileIsBadException("OutputDataReader::getOutputData() -> Error! File is not good, probably it is a directory."); throw FileIsBadException("OutputDataReader::getOutputData() -> Error! File is not good, "
"probably it is a directory.");
} }
OutputData<double > *result = m_read_strategy->readOutputData(fin); OutputData<double > *result = m_read_strategy->readOutputData(fin);
......
Core/Tools/src/PyGenTools.cpp
+ 0
− 28
View file @ 8eaa510e
...@@ -85,34 +85,6 @@ bool PyGenTools::testPyScript(Simulation *simulation) ...@@ -85,34 +85,6 @@ bool PyGenTools::testPyScript(Simulation *simulation)
pythonFile << genPyScript(simulation); pythonFile << genPyScript(simulation);
pythonFile.close(); pythonFile.close();
// Py_Initialize();
// std::string path("sys.path.append('");
// path.append("/home/abhishekskhanna/BornAgain-Build");
// path.append("')");
// PyRun_SimpleString("import sys");
// PyRun_SimpleString(path.c_str());
// PyObject *pName = PyString_FromString("PythonScript");
// if (!pName)
// throw std::runtime_error("PyGenTools::testPyScript -> pName is NULL");
// PyObject *pModule = PyImport_Import(pName);
// if (!pModule)
// throw std::runtime_error("PyGenTools::testPyScript -> pModule is NULL");
// PyObject *pDict = PyModule_GetDict(pModule);
// if (!pDict)
// throw std::runtime_error("PyGenTools::testPyScript -> pDict is NULL");
// PyObject *pRunSimulation = PyDict_GetItemString(pDict, "runSimulation");
// if (!pRunSimulation)
// throw std::runtime_error(
// "PyGenTools::testPyScript -> pRunSimulation is NULL");
// PyObject *pResult = PyObject_CallObject(pRunSimulation, NULL);
// if (!pResult)
// throw std::runtime_error("PyGenTools::testPyScript -> pResult is NULL");
// Simulation *pSimulation = boost::python::extract<Simulation *>(pResult);
// Py_Finalize();
// boost::scoped_ptr<const OutputData<double> > reference_data(
// simulation->getIntensityData());
// boost::scoped_ptr<const OutputData<double> > simulated_data(
// pSimulation->getIntensityData());
std::string command = std::string(BORNAGAIN_PYTHON_EXE ) + " PythonScript.py"; std::string command = std::string(BORNAGAIN_PYTHON_EXE ) + " PythonScript.py";
int return_code = std::system(command.c_str()); int return_code = std::system(command.c_str());
(void)return_code; (void)return_code;
......
Core/Tools/src/PyGenVisitor.cpp
+ 6
− 14
View file @ 8eaa510e
...@@ -294,7 +294,7 @@ std::string PyGenVisitor::defineMaterials() const ...@@ -294,7 +294,7 @@ std::string PyGenVisitor::defineMaterials() const
if (m_label->getMaterialMap()->size() == 0) return ""; if (m_label->getMaterialMap()->size() == 0) return "";
std::ostringstream result; std::ostringstream result;
result << std::setprecision(12); result << std::setprecision(12);
result << "\t#Defining Materials\n"; result << "\t# Defining Materials\n";
std::map<const IMaterial *,std::string>::iterator it = std::map<const IMaterial *,std::string>::iterator it =
m_label->getMaterialMap()->begin(); m_label->getMaterialMap()->begin();
std::set<std::string> visitedMaterials; std::set<std::string> visitedMaterials;
...@@ -1300,7 +1300,7 @@ std::string PyGenVisitor::defineParticleLayouts() const ...@@ -1300,7 +1300,7 @@ std::string PyGenVisitor::defineParticleLayouts() const
if (const ParticleLayout *particleLayout = if (const ParticleLayout *particleLayout =
dynamic_cast<const ParticleLayout *>(iLayout)) dynamic_cast<const ParticleLayout *>(iLayout))
{ {
result << "\t" << it->second << " = ParticleLayout()\n\n"; result << "\t" << it->second << " = ParticleLayout()\n";
size_t numberOfParticles = particleLayout->getNumberOfParticles(); size_t numberOfParticles = particleLayout->getNumberOfParticles();
size_t particleIndex = 0; size_t particleIndex = 0;
...@@ -1311,10 +1311,7 @@ std::string PyGenVisitor::defineParticleLayouts() const ...@@ -1311,10 +1311,7 @@ std::string PyGenVisitor::defineParticleLayouts() const
kvector_t pos = particleInfo->getPosition(); kvector_t pos = particleInfo->getPosition();
if (pos.x()!=0.0 || pos.y()!=0.0) if (pos.x()!=0.0 || pos.y()!=0.0)
{ {
result << "\t# Defining " result << "\t"
<< m_label->getLabel(particleInfo->getParticle());
result << "\n\t"
<< m_label->getLabel(particleInfo->getParticle()) << m_label->getLabel(particleInfo->getParticle())
<< "_position = kvector_t(" << "_position = kvector_t("
<< pos.x() << pos.x()
...@@ -1341,17 +1338,13 @@ std::string PyGenVisitor::defineParticleLayouts() const ...@@ -1341,17 +1338,13 @@ std::string PyGenVisitor::defineParticleLayouts() const
} }
else else
{ {
result << "\t# Defining " result << "\t" << it->second
<< m_label->getLabel(particleInfo->getParticle());
result << "\n\t" << it->second
<< ".addParticle(" << ".addParticle("
<< m_label->getLabel(particleInfo->getParticle()) << m_label->getLabel(particleInfo->getParticle())
<< "," << ","
<< PyGenTools::printDouble(particleInfo->getDepth()) << "," << PyGenTools::printDouble(particleInfo->getDepth()) << ","
<< PyGenTools::printDouble(particleInfo->getAbundance()) <<")\n"; << PyGenTools::printDouble(particleInfo->getAbundance()) <<")\n";
} }
particleIndex++; particleIndex++;
} }
...@@ -1410,7 +1403,7 @@ std::string PyGenVisitor::addLayoutsToLayers() const ...@@ -1410,7 +1403,7 @@ std::string PyGenVisitor::addLayoutsToLayers() const
if (m_label->getParticleLayoutMap()->size() == 0) return ""; if (m_label->getParticleLayoutMap()->size() == 0) return "";
std::ostringstream result; std::ostringstream result;
result << std::setprecision(12); result << std::setprecision(12);
result << "\n\t# Adding layouts to layers\n"; result << "\n\t# Adding layouts to layers";
std::map<const Layer *,std::string>::iterator it = m_label->getLayerMap()->begin(); std::map<const Layer *,std::string>::iterator it = m_label->getLayerMap()->begin();
while (it != m_label->getLayerMap()->end()) while (it != m_label->getLayerMap()->end())
{ {
...@@ -1434,7 +1427,7 @@ std::string PyGenVisitor::defineMultiLayers() const ...@@ -1434,7 +1427,7 @@ std::string PyGenVisitor::defineMultiLayers() const
if (m_label->getMultiLayerMap()->size() == 0) return ""; if (m_label->getMultiLayerMap()->size() == 0) return "";
std::ostringstream result; std::ostringstream result;
result << std::setprecision(12); result << std::setprecision(12);
result << "n\t# Defining Multilayers\n"; result << "\n\t# Defining Multilayers\n";
std::map<const MultiLayer *,std::string>::iterator it = std::map<const MultiLayer *,std::string>::iterator it =
m_label->getMultiLayerMap()->begin(); m_label->getMultiLayerMap()->begin();
while (it != m_label->getMultiLayerMap()->end()) while (it != m_label->getMultiLayerMap()->end())
...@@ -1556,7 +1549,6 @@ std::string PyGenVisitor::defineRunSimulation() const ...@@ -1556,7 +1549,6 @@ std::string PyGenVisitor::defineRunSimulation() const
result << "\tsimulation = getSimulation()\n"; result << "\tsimulation = getSimulation()\n";
result << "\tsimulation.setSample(sample)\n"; result << "\tsimulation.setSample(sample)\n";
result << "\tsimulation.runSimulation()\n"; result << "\tsimulation.runSimulation()\n";
result << "\tsimulation.normalize()\n";
result << "\tif filename != '':\n"; result << "\tif filename != '':\n";
result << "\t\tIntensityDataIOFactory.writeIntensityData(simulation." result << "\t\tIntensityDataIOFactory.writeIntensityData(simulation."
<< "getIntensityData(), filename + '.int')\n\n"; << "getIntensityData(), filename + '.int')\n\n";
......
Tests/FunctionalTests/TestPyCore/CMakeLists.txt
+ 4
− 4
View file @ 8eaa510e
...@@ -58,7 +58,7 @@ include_directories( ...@@ -58,7 +58,7 @@ include_directories(
${GSL_INCLUDE_DIR} ${GSL_INCLUDE_DIR}
) )
#foreach(_test ${list_of_cpp_python_tests}) foreach(_test ${list_of_cpp_python_tests})
# BORNAGAIN_EXECUTABLE(${_test} LOCATIONS ${_test} EXCLUDE_FROM_ALL LIBRARIES ${BornAgainCore_LIBRARY}) BORNAGAIN_EXECUTABLE(${_test} LOCATIONS ${_test} EXCLUDE_FROM_ALL LIBRARIES ${BornAgainCore_LIBRARY})
# BORNAGAIN_ADD_TEST(${_test} INPUT_DIR ${CMAKE_BINARY_DIR}/Tests/ReferenceData/BornAgain/) BORNAGAIN_ADD_TEST(${_test} INPUT_DIR ${CMAKE_BINARY_DIR}/Tests/ReferenceData/BornAgain/)
#endforeach() endforeach()
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment