Commit e7d2a40b authored by Alvarez, Gonzalo's avatar Alvarez, Gonzalo
Browse files

Ainur: Complex for now treated as real

parent 3c8b6484

src/Ainur/AinurState.h

+7 −6
Original line number Diff line number Diff line
@@ -273,14 +273,15 @@ private: 
	template<typename T>

	void convertInternal(std::vector<T>& t,

	                     String value,

	                     typename EnableIf<Loki::TypeTraits<T>::isArith,

	                     typename EnableIf<Loki::TypeTraits<T>::isArith ||

	                     IsComplexNumber<T>::True,

	                     int>::Type = 0) const;



	template<typename T>

	void convertInternal(std::vector<std::complex<T> >& t,

	                     String value,

	                     typename EnableIf<Loki::TypeTraits<T>::isArith,

	                     int>::Type = 0) const;

//	template<typename T>

//	void convertInternal(std::vector<std::complex<T> >& t,

//	                     String value,

//	                     typename EnableIf<Loki::TypeTraits<T>::isArith,

//	                     int>::Type = 0) const;



	template<typename T>

	void convertInternal(Matrix<T>& t,

src/Ainur/AinurState1.cpp

+20 −42
Original line number Diff line number Diff line
@@ -22,6 +22,15 @@ ruleRows<DoubleOrFloatType>() 
	return "[" >> -(boost::spirit::DoubleOrFloatUnderscore % ",") >> "]";

}



template<>

boost::spirit::qi::rule<std::string::iterator,

std::vector<std::complex<DoubleOrFloatType> >(),

boost::spirit::qi::space_type>

ruleRows<std::complex<DoubleOrFloatType> >()

{

	return "[" >> -(boost::spirit::DoubleOrFloatUnderscore % ",") >> "]";

}



template<>

boost::spirit::qi::rule<std::string::iterator,

std::vector<SizeType>(),
@@ -56,6 +65,15 @@ ruleElipsis<DoubleOrFloatType>() 
	return  "[" >> boost::spirit::DoubleOrFloatUnderscore  >> "," >> "..." >> "]";

}



template<>

boost::spirit::qi::rule<std::string::iterator,

std::complex<DoubleOrFloatType>(),

boost::spirit::qi::space_type>

ruleElipsis<std::complex<DoubleOrFloatType> >()

{

	return  "[" >> boost::spirit::DoubleOrFloatUnderscore  >> "," >> "..." >> "]";

}



template<>

boost::spirit::qi::rule<std::string::iterator,

SizeType(),
@@ -211,7 +229,8 @@ void AinurState::convertInternal(Matrix<T>& t, 
template<typename T>

void AinurState::convertInternal(std::vector<T>& t,

                                 String value,

                                 typename EnableIf<Loki::TypeTraits<T>::isArith,

                                 typename EnableIf<Loki::TypeTraits<T>::isArith ||

                                 IsComplexNumber<T>::True,

                                 int>::Type) const

{

	namespace qi = boost::spirit::qi;
@@ -238,47 +257,6 @@ void AinurState::convertInternal(std::vector<T>& t, 
		std::cerr << "vector parsing: unmatched part exists\n";

}



template<typename T>

void AinurState::convertInternal(std::vector<std::complex<T> >& t,

                                 String value,

                                 typename EnableIf<Loki::TypeTraits<T>::isArith,

                                 int>::Type) const

{ 

	namespace qi = boost::spirit::qi;

	ActionCmplx actionRows1("rows1", t);

	ActionCmplx actionRows2("rows2", t);

	ActionCmplx actionRows3("rows3", t);



#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;

	ManyTypes ruRows = MY_V_OF_COMPLEX;

	//	qi::rule<IteratorType, std::complex<T>(), qi::space_type> ruElipsis =

	//	        ruleElipsis<std::complex<T> >();





	//Action<std::complex<T> > actionElipsis("elipsis", t);



	bool r = qi::phrase_parse(it,

	                          value.end(),

	                          ruRows,// | ruElipsis[actionElipsis],

	                          qi::space);



	//check if we have a match

	if (!r)

		err("vector parsing failed\n");



	if (it != value.end())

		std::cerr << "vector parsing: unmatched part exists\n";

}



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



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