[Echempp-devel] Experiment/ExcitationFunction excitationFunction.hpp, 1.38, 1.39 segment.hpp, 1.36,
Status: Beta
Brought to you by:
berndspeiser
Menu
▾
▴
[Echempp-devel] Experiment/ExcitationFunction excitationFunction.hpp, 1.38, 1.39 segment.hpp, 1.36, 1.37
|
From: Bernd S. <ber...@us...> - 2007-05-19 15:52:24
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction
In directory sc8-pr-cvs17:/tmp/cvs-serv10842/Experiment/ExcitationFunction
Modified Files:
excitationFunction.hpp segment.hpp
Log Message:
TinyXml 2.5.3 used - xml load problem solved
Index: excitationFunction.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.hpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** excitationFunction.hpp 15 May 2007 14:10:45 -0000 1.38
--- excitationFunction.hpp 19 May 2007 15:52:13 -0000 1.39
***************
*** 328,349 ****
this->clear();
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
- FILE *out1 = fopen ("outfile1", "w");
- element->Print (out1, 1);
- fclose (out1);
-
- std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
- //std::cout << " in ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
! if (element )
! {
! /*
! if (element->ValueStr() == ExcitationFunction::TAG)
{
- */
- std::cout << "in element" << std::endl;
TiXmlNode *child = 0;
--- 328,335 ----
this->clear();
TiXmlElement *element = node.Element();
! if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
TiXmlNode *child = 0;
***************
*** 351,363 ****
(Segments::Segment::TAG, child)))
{
- std::cout << "in child" << std::endl;
if ((child->ToElement ())->Attribute
(Segments::Segment::IDTAG))
{
- std::cout << "in attribute" << std::endl;
Segments::DISegment<D, I> *new_segment
= Segments::DISegment<D, I>::Factory::Instance().
! CreateObject((child->ToElement ())->Attribute
! (Segments::Segment::IDTAG));
new_segment->load (TiXmlHandle (child));
--- 337,347 ----
(Segments::Segment::TAG, child)))
{
if ((child->ToElement ())->Attribute
(Segments::Segment::IDTAG))
{
Segments::DISegment<D, I> *new_segment
= Segments::DISegment<D, I>::Factory::Instance().
! CreateObject(*((child->ToElement ())->Attribute
! (Segments::Segment::IDTAG)));
new_segment->load (TiXmlHandle (child));
***************
*** 366,370 ****
}
}
- // }
}
else
--- 350,353 ----
***************
*** 896,909 ****
this->clear();
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
- FILE *out = fopen ("outfile", "w");
- element->Print (out, 1);
- fclose (out);
-
- std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
- //std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
--- 879,883 ----
Index: segment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** segment.hpp 15 May 2007 14:10:45 -0000 1.36
--- segment.hpp 19 May 2007 15:52:13 -0000 1.37
***************
*** 461,485 ****
void load (const TiXmlHandle node)
{
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << " Tag zum Vergleich: `" << Segment::TAG << "'" << std::endl;
-
-
- // commented for testing
- /*
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
- */
if (element->Attribute(STARTINGVALUE) &&
element->Attribute(STARTINGUNIT))
{
! std::string val = element->Attribute(STARTINGVALUE);
val.append(" ");
! val.append(element->Attribute(STARTINGUNIT));
_startingValue = val;
}
--- 461,477 ----
void load (const TiXmlHandle node)
{
TiXmlElement *element = node.Element();
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(STARTINGVALUE) &&
element->Attribute(STARTINGUNIT))
{
! std::string val = *element->Attribute(STARTINGVALUE);
val.append(" ");
! val.append(*element->Attribute(STARTINGUNIT));
_startingValue = val;
}
***************
*** 487,493 ****
element->Attribute(ENDUNIT))
{
! std::string val = element->Attribute(ENDVALUE);
val.append(" ");
! val.append(element->Attribute(ENDUNIT));
_endValue = val;
}
--- 479,485 ----
element->Attribute(ENDUNIT))
{
! std::string val = *element->Attribute(ENDVALUE);
val.append(" ");
! val.append(*element->Attribute(ENDUNIT));
_endValue = val;
}
***************
*** 495,512 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
_derivative = (_endValue - _startingValue)/DISegment<D,I>::_Imax;
- // commented for testing
- /*
}
else
throw LoadError
("error loading linear segment: incorrect element");
- */
}
--- 487,501 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
_derivative = (_endValue - _startingValue)/DISegment<D,I>::_Imax;
}
else
throw LoadError
("error loading linear segment: incorrect element");
}
***************
*** 728,744 ****
{
TiXmlElement *element = node.Element();
- // commented for testing
- /*
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
- */
if (element->Attribute(CONSTANTVALUE) &&
element->Attribute(CONSTANTUNIT))
{
! std::string val = element->Attribute(CONSTANTVALUE);
val.append(" ");
! val.append(element->Attribute(CONSTANTUNIT));
_constantValue = val;
}
--- 717,730 ----
{
TiXmlElement *element = node.Element();
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(CONSTANTVALUE) &&
element->Attribute(CONSTANTUNIT))
{
! std::string val = *element->Attribute(CONSTANTVALUE);
val.append(" ");
! val.append(*element->Attribute(CONSTANTUNIT));
_constantValue = val;
}
***************
*** 746,762 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
- // commented for testing
- /*
-
}
else
throw LoadError
("error loading constant segment: incorrect element");
- */
}
--- 732,744 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
}
else
throw LoadError
("error loading constant segment: incorrect element");
}
***************
*** 1024,1035 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(OFFSETVALUE) &&
element->Attribute(OFFSETUNIT) )
{
! std::string val = element->Attribute(OFFSETVALUE);
val.append(" ");
! val.append(element->Attribute(OFFSETUNIT));
_offset = val;
}
--- 1006,1017 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(OFFSETVALUE) &&
element->Attribute(OFFSETUNIT) )
{
! std::string val = *element->Attribute(OFFSETVALUE);
val.append(" ");
! val.append(*element->Attribute(OFFSETUNIT));
_offset = val;
}
***************
*** 1037,1043 ****
element->Attribute(AMPLITUDEUNIT))
{
! std::string val = element->Attribute(AMPLITUDEVALUE);
val.append(" ");
! val.append(element->Attribute(AMPLITUDEUNIT));
_amplitude = val;
}
--- 1019,1025 ----
element->Attribute(AMPLITUDEUNIT))
{
! std::string val = *element->Attribute(AMPLITUDEVALUE);
val.append(" ");
! val.append(*element->Attribute(AMPLITUDEUNIT));
_amplitude = val;
}
***************
*** 1045,1051 ****
element->Attribute(ANGULARFREQUENCYUNIT) )
{
! std::string val = element->Attribute(ANGULARFREQUENCYVALUE);
val.append(" ");
! val.append(element->Attribute(ANGULARFREQUENCYUNIT));
_angularFrequency = val;
}
--- 1027,1033 ----
element->Attribute(ANGULARFREQUENCYUNIT) )
{
! std::string val = *element->Attribute(ANGULARFREQUENCYVALUE);
val.append(" ");
! val.append(*element->Attribute(ANGULARFREQUENCYUNIT));
_angularFrequency = val;
}
***************
*** 1053,1059 ****
element->Attribute(PHASESHIFTUNIT) )
{
! std::string val = element->Attribute(PHASESHIFTVALUE);
val.append(" ");
! val.append(element->Attribute(PHASESHIFTUNIT));
_phaseShift = val;
}
--- 1035,1041 ----
element->Attribute(PHASESHIFTUNIT) )
{
! std::string val = *element->Attribute(PHASESHIFTVALUE);
val.append(" ");
! val.append(*element->Attribute(PHASESHIFTUNIT));
_phaseShift = val;
}
***************
*** 1061,1067 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1043,1049 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1354,1365 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1336,1347 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 1367,1373 ****
element->Attribute(D1UNIT))
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1349,1355 ----
element->Attribute(D1UNIT))
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 1379,1385 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1361,1367 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1652,1663 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1634,1645 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 1665,1671 ****
element->Attribute(D1UNIT))
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1647,1653 ----
element->Attribute(D1UNIT))
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 1673,1679 ****
element->Attribute(OMEGAUNIT))
{
! std::string val = element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(element->Attribute(OMEGAUNIT));
_omega = val;
}
--- 1655,1661 ----
element->Attribute(OMEGAUNIT))
{
! std::string val = *element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(*element->Attribute(OMEGAUNIT));
_omega = val;
}
***************
*** 1681,1687 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1663,1669 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1988,1999 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT) )
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1970,1981 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT) )
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 2001,2007 ****
element->Attribute(D1UNIT) )
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1983,1989 ----
element->Attribute(D1UNIT) )
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 2013,2019 ****
element->Attribute(OMEGAUNIT))
{
! std::string val = element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(element->Attribute(OMEGAUNIT));
_omega = val;
}
--- 1995,2001 ----
element->Attribute(OMEGAUNIT))
{
! std::string val = *element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(*element->Attribute(OMEGAUNIT));
_omega = val;
}
***************
*** 2021,2027 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 2003,2009 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 2281,2292 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(DIGITALVALUE) &&
element->Attribute(DIGITALUNIT) )
{
! std::string val = element->Attribute(DIGITALVALUE);
val.append(" ");
! val.append(element->Attribute(DIGITALUNIT));
_digitalValue = val;
}
--- 2263,2274 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(DIGITALVALUE) &&
element->Attribute(DIGITALUNIT) )
{
! std::string val = *element->Attribute(DIGITALVALUE);
val.append(" ");
! val.append(*element->Attribute(DIGITALUNIT));
_digitalValue = val;
}
***************
*** 2294,2300 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<quantity::Digital,I>::_Imax = val;
}
--- 2276,2282 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<quantity::Digital,I>::_Imax = val;
}
|
