source: issm/oecreview/Archive/16554-17801/ISSM-16654-16655.diff

Last change on this file was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 5.9 KB
RevLine 
[17802]1Index: ../trunk-jpl/src/c/classes/Params/BoolParam.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Params/BoolParam.cpp (revision 16654)
4+++ ../trunk-jpl/src/c/classes/Params/BoolParam.cpp (revision 16655)
5@@ -41,8 +41,7 @@
6 /*}}}*/
7 /*FUNCTION BoolParam::DeepEcho{{{*/
8 void BoolParam::DeepEcho(void){
9-
10- _printf_(" BoolParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false")<<"\n");
11+ _printf_(setw(22)<<" BoolParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false")<<"\n");
12 }
13 /*}}}*/
14 /*FUNCTION BoolParam::Id{{{*/
15Index: ../trunk-jpl/src/c/classes/Params/StringParam.cpp
16===================================================================
17--- ../trunk-jpl/src/c/classes/Params/StringParam.cpp (revision 16654)
18+++ ../trunk-jpl/src/c/classes/Params/StringParam.cpp (revision 16655)
19@@ -43,7 +43,7 @@
20 /*}}}*/
21 /*FUNCTION StringParam::DeepEcho{{{*/
22 void StringParam::DeepEcho(void){
23- _printf_(" StringParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
24+ _printf_(setw(22)<<" StringParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
25 }
26 /*}}}*/
27 /*FUNCTION StringParam::Id{{{*/
28Index: ../trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp
29===================================================================
30--- ../trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp (revision 16654)
31+++ ../trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp (revision 16655)
32@@ -41,23 +41,15 @@
33 /*FUNCTION DoubleVecParam::Echo {{{*/
34 void DoubleVecParam::Echo(void){
35
36- _printf_("DoubleVecParam:\n");
37- _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
38- _printf_(" vector size: " << this->M << "\n");
39+ _printf_(setw(22)<<" DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" size: "<<this->M<<"\n");
40
41 }
42 /*}}}*/
43 /*FUNCTION DoubleVecParam::DeepEcho{{{*/
44 void DoubleVecParam::DeepEcho(void){
45-
46- int i;
47-
48- _printf_("DoubleVecParam:\n");
49- _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
50- _printf_(" vector size: " << this->M << "\n");
51- for(i=0;i<this->M;i++){
52- _printf_(i << " " << this->values[i] << "\n");
53- }
54+ _printf_(setw(22)<<" DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<"[");
55+ for(int i=0;i<this->M;i++) _printf_(" "<< this->values[i]);
56+ _printf_("\n");
57 }
58 /*}}}*/
59 /*FUNCTION DoubleVecParam::Id{{{*/
60Index: ../trunk-jpl/src/c/classes/Params/FileParam.cpp
61===================================================================
62--- ../trunk-jpl/src/c/classes/Params/FileParam.cpp (revision 16654)
63+++ ../trunk-jpl/src/c/classes/Params/FileParam.cpp (revision 16655)
64@@ -42,7 +42,7 @@
65 /*FUNCTION FileParam::DeepEcho{{{*/
66 void FileParam::DeepEcho(void){
67
68- _printf_(" FileParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
69+ _printf_(setw(22)<<" FileParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
70 }
71 /*}}}*/
72 /*FUNCTION FileParam::Id{{{*/
73Index: ../trunk-jpl/src/c/classes/Params/DataSetParam.cpp
74===================================================================
75--- ../trunk-jpl/src/c/classes/Params/DataSetParam.cpp (revision 16654)
76+++ ../trunk-jpl/src/c/classes/Params/DataSetParam.cpp (revision 16655)
77@@ -43,9 +43,9 @@
78 /*FUNCTION DataSetParam::DeepEcho{{{*/
79 void DataSetParam::DeepEcho(void){
80
81- _printf_("DataSetParam:\n");
82- _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
83+ _printf_(setw(22)<<" DataSetParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" ----- begin\n");
84 this->value->Echo();
85+ _printf_(setw(22)<<" DataSetParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" ----- end\n");
86 }
87 /*}}}*/
88 /*FUNCTION DataSetParam::Id{{{*/
89Index: ../trunk-jpl/src/c/classes/Params/IntParam.cpp
90===================================================================
91--- ../trunk-jpl/src/c/classes/Params/IntParam.cpp (revision 16654)
92+++ ../trunk-jpl/src/c/classes/Params/IntParam.cpp (revision 16655)
93@@ -42,7 +42,7 @@
94 /*FUNCTION IntParam::DeepEcho{{{*/
95 void IntParam::DeepEcho(void){
96
97- _printf_(" IntParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
98+ _printf_(setw(22)<<" IntParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
99 }
100 /*}}}*/
101 /*FUNCTION IntParam::Id{{{*/
102Index: ../trunk-jpl/src/c/classes/Params/StringArrayParam.cpp
103===================================================================
104--- ../trunk-jpl/src/c/classes/Params/StringArrayParam.cpp (revision 16654)
105+++ ../trunk-jpl/src/c/classes/Params/StringArrayParam.cpp (revision 16655)
106@@ -66,15 +66,9 @@
107 /*FUNCTION StringArrayParam::DeepEcho{{{*/
108 void StringArrayParam::DeepEcho(void){
109
110- int i;
111- char* string=NULL;
112-
113- _printf_("StringArrayParam:\n");
114- _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
115- for(i=0;i<this->numstrings;i++){
116- string=this->value[i];
117- _printf_(" " << i << ": " << string << "\n");
118- }
119+ _printf_(setw(22)<<" StringArrayParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" {");
120+ for(int i=0;i<this->numstrings;i++) _printf_(" '"<<this->value[i]<<"'");
121+ _printf_("}\n");
122 }
123 /*}}}*/
124 /*FUNCTION StringArrayParam::Id{{{*/
125Index: ../trunk-jpl/src/c/classes/Params/DoubleParam.cpp
126===================================================================
127--- ../trunk-jpl/src/c/classes/Params/DoubleParam.cpp (revision 16654)
128+++ ../trunk-jpl/src/c/classes/Params/DoubleParam.cpp (revision 16655)
129@@ -39,7 +39,7 @@
130 /*FUNCTION DoubleParam::DeepEcho{{{*/
131 void DoubleParam::DeepEcho(void){
132
133- _printf_(" DoubleParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
134+ _printf_(setw(22)<<" DoubleParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
135 }
136 /*}}}*/
137 /*FUNCTION DoubleParam::Id{{{*/
Note: See TracBrowser for help on using the repository browser.