Ainur compiles with float (e6e87eff) · Commits · Alvarez, Gonzalo / PsimagLite

src/Ainur/AinurDoubleOrFloat.h

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		#ifndef AINURDOUBLEORFLOAT_H
		#define AINURDOUBLEORFLOAT_H

		namespace PsimagLite {

		#ifdef USE_FLOAT
		#define DoubleOrFloatType float
		#define DoubleOrFloatUnderscore float_
		#else
		#define DoubleOrFloatType double
		#define DoubleOrFloatUnderscore double_
		#endif

		}
		#endif // AINURDOUBLEORFLOAT_H

src/Ainur/AinurReadable.h

+2 −1

Original line number	Diff line number	Diff line
		#ifndef AINURREADABLE_H
		#define AINURREADABLE_H
		#include "AinurStore.h"
		#include "AinurDoubleOrFloat.h"

		namespace PsimagLite {

		@@ -12,7 +13,7 @@ public:
		typedef Vector<StoreType>::Type VectorStoreType;
		typedef StoreType::AinurLexicalType AinurLexicalType;
		typedef AinurLexicalType::VectorStringType VectorStringType;
		typedef double RealType;
		typedef DoubleOrFloatType RealType;
		typedef std::complex<RealType> ComplexType;

		AinurReadable(const VectorStringType& names,

src/Ainur/AinurState.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include "../PsimagLite.h"
		#include <numeric>
		#include "../Matrix.h"
		#include "AinurDoubleOrFloat.h"

		namespace PsimagLite {

		@@ -12,7 +13,7 @@ class AinurState {

		typedef Vector<SizeType>::Type VectorSizeType;
		typedef Vector<String>::Type VectorStringType;
		typedef std::complex<double> ComplexType;
		typedef std::complex<DoubleOrFloatType> ComplexType;

		struct myprint
		{
		@@ -30,13 +31,13 @@ class AinurState {
		{}

		template <typename A, typename ContextType>
		typename EnableIf<TypesEqual<A, double>::True, void>::Type
		typename EnableIf<TypesEqual<A, DoubleOrFloatType>::True, void>::Type
		operator()(A& attr,
		ContextType&,
		bool&) const;

		template <typename A, typename ContextType>
		typename EnableIf<!TypesEqual<A, double>::True, void>::Type
		typename EnableIf<!TypesEqual<A, DoubleOrFloatType>::True, void>::Type
		operator()(A& attr,
		ContextType&,
		bool&) const;

src/Ainur/AinurState1.cpp

+17 −15

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		#include <boost/spirit/include/qi.hpp>
		#include <boost/spirit/include/phoenix_core.hpp>
		#include <boost/spirit/include/phoenix_operator.hpp>
		#include "AinurDoubleOrFloat.h"

		namespace PsimagLite {

		@@ -14,11 +15,11 @@ ruleRows();

		template<>
		boost::spirit::qi::rule<std::string::iterator,
		std::vector<double>(),
		std::vector<DoubleOrFloatType>(),
		boost::spirit::qi::space_type>
		ruleRows<double>()
		ruleRows<DoubleOrFloatType>()
		{
		return "[" >> -(boost::spirit::double_ % ",") >> "]";
		return "[" >> -(boost::spirit::DoubleOrFloatUnderscore % ",") >> "]";
		}

		template<>
		@@ -39,11 +40,11 @@ ruleElipsis();

		template<>
		boost::spirit::qi::rule<std::string::iterator,
		double(),
		DoubleOrFloatType(),
		boost::spirit::qi::space_type>
		ruleElipsis<double>()
		ruleElipsis<DoubleOrFloatType>()
		{
		return "[" >> boost::spirit::double_ >> "," >> "..." >> "]";
		return "[" >> boost::spirit::DoubleOrFloatUnderscore >> "," >> "..." >> "]";
		}

		template<>
		@@ -125,13 +126,13 @@ AinurState::Action<T>::operator()(A& attr,
		}

		template <typename A, typename ContextType>
		typename EnableIf<TypesEqual<A, double>::True, void>::Type
		typename EnableIf<TypesEqual<A, DoubleOrFloatType>::True, void>::Type
		AinurState::ActionCmplx::operator()(A& attr,
		ContextType&,
		bool&) const
		{
		if (name_ == "rows2")
		t_.push_back(std::complex<double>(0.0, attr));
		t_.push_back(std::complex<DoubleOrFloatType>(0.0, attr));
		else if (name_ == "rows3")
		t_.push_back(attr);
		else
		@@ -139,13 +140,13 @@ AinurState::ActionCmplx::operator()(A& attr,
		}

		template <typename A, typename ContextType>
		typename EnableIf<!TypesEqual<A, double>::True, void>::Type
		typename EnableIf<!TypesEqual<A, DoubleOrFloatType>::True, void>::Type
		AinurState::ActionCmplx::operator()(A& attr,
		ContextType&,
		bool&) const
		{
		if (name_ == "rows1") {
		t_.push_back(std::complex<double>(
		t_.push_back(std::complex<DoubleOrFloatType>(
		boost::fusion::at_c<0>(attr),
		boost::fusion::at_c<1>(attr)));
		} else {
		@@ -224,14 +225,14 @@ void AinurState::convertInternal(std::vector<std::complex<T> >& t,
		ActionCmplx actionRows1("rows1", t);
		ActionCmplx actionRows2("rows2", t);
		ActionCmplx actionRows3("rows3", t);
		#define MY_COMPLEX (qi::double_ >> qi::double_ >> "i") [actionRows1] \| (qi::double_ >> "i") [actionRows2] \| qi::double_ [actionRows3]

		#define MY_COMPLEX (qi::DoubleOrFloatUnderscore >> qi::DoubleOrFloatUnderscore >> "i") [actionRows1] \| (qi::DoubleOrFloatUnderscore >> "i") [actionRows2] \| qi::DoubleOrFloatUnderscore [actionRows3]

		typedef BOOST_TYPEOF(MY_COMPLEX) OneType;
		typedef std::string::iterator IteratorType;

		IteratorType it = value.begin();


		OneType cmplxN = MY_COMPLEX;
		#define MY_V_OF_COMPLEX "[" >> -(cmplxN % ",") >> "]"
		typedef BOOST_TYPEOF(MY_V_OF_COMPLEX) ManyTypes;
		@@ -255,11 +256,12 @@ void AinurState::convertInternal(std::vector<std::complex<T> >& t,
		std::cerr << "vector parsing: unmatched part exists\n";
		}

		template void AinurState::convertInternal(Matrix<double>&,String, int) const;
		template void AinurState::convertInternal(Matrix<DoubleOrFloatType>&,String, int) const;

		template void AinurState::convertInternal(std::vector<DoubleOrFloatType>&, String, int) const;

		template void AinurState::convertInternal(std::vector<double>&, String, int) const;
		template void AinurState::convertInternal(std::vector<SizeType>&, String, int) const;

		template void AinurState::convertInternal(std::vector<std::complex<double> >&,
		template void AinurState::convertInternal(std::vector<std::complex<DoubleOrFloatType> >&,
		String, int) const;
		} // namespace PsimagLite

src/Version.h

+1 −1

Original line number	Diff line number	Diff line
		#ifndef PSIMAGLITE_VERSION
		#define PSIMAGLITE_VERSION "2.42"
		#define PSIMAGLITE_VERSION "2.43"
		#endif