Commit 91484beb2eb77f37e132c143d8223c60842dc785

Authored by Michał Lenart
1 parent f34a3241

mała zmiana w outpucie

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@193 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
morfeusz/outputUtils.hpp
@@ -21,7 +21,7 @@ void printMorphResults(const std::vector<MorphInterpretation>& res, bool printNo @@ -21,7 +21,7 @@ void printMorphResults(const std::vector<MorphInterpretation>& res, bool printNo
21 printf("]\n["); 21 printf("]\n[");
22 } 22 }
23 else if (prevStart != -1) { 23 else if (prevStart != -1) {
24 - printf(";\n"); 24 + printf(";\n ");
25 } 25 }
26 // printf("%s", mi.toString(true).c_str()); 26 // printf("%s", mi.toString(true).c_str());
27 if (printNodeNumbers) { 27 if (printNodeNumbers) {
nbproject/configurations.xml
@@ -99,7 +99,9 @@ @@ -99,7 +99,9 @@
99 <rebuildPropChanged>false</rebuildPropChanged> 99 <rebuildPropChanged>false</rebuildPropChanged>
100 </toolsSet> 100 </toolsSet>
101 <flagsDictionary> 101 <flagsDictionary>
102 - <element flagsID="0" commonFlags="-std=c++98 -O3 -fPIC"/> 102 + <element flagsID="0" commonFlags="-g -O2 -fPIC"/>
  103 + <element flagsID="1" commonFlags="-std=c++98 -O3"/>
  104 + <element flagsID="2" commonFlags="-std=c++98 -O3 -fPIC"/>
103 </flagsDictionary> 105 </flagsDictionary>
104 <codeAssistance> 106 <codeAssistance>
105 </codeAssistance> 107 </codeAssistance>
@@ -109,11 +111,7 @@ @@ -109,11 +111,7 @@
109 <buildCommand>${MAKE} -f Makefile</buildCommand> 111 <buildCommand>${MAKE} -f Makefile</buildCommand>
110 <cleanCommand>${MAKE} -f Makefile clean</cleanCommand> 112 <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
111 <executablePath>build/morfeusz/morfeusz_analyzer</executablePath> 113 <executablePath>build/morfeusz/morfeusz_analyzer</executablePath>
112 - <ccTool flags="0">  
113 - <incDir>  
114 - <pElem>build</pElem>  
115 - <pElem>morfeusz</pElem>  
116 - </incDir> 114 + <ccTool flags="2">
117 <preprocessorList> 115 <preprocessorList>
118 <Elem>NDEBUG</Elem> 116 <Elem>NDEBUG</Elem>
119 </preprocessorList> 117 </preprocessorList>
@@ -125,7 +123,11 @@ @@ -125,7 +123,11 @@
125 <item path="build/default_synth_fsa.cpp" ex="false" tool="1" flavor2="4"> 123 <item path="build/default_synth_fsa.cpp" ex="false" tool="1" flavor2="4">
126 </item> 124 </item>
127 <item path="build/morfeusz/default_fsa.cpp" ex="false" tool="1" flavor2="4"> 125 <item path="build/morfeusz/default_fsa.cpp" ex="false" tool="1" flavor2="4">
128 - <ccTool flags="0"> 126 + <ccTool flags="2">
  127 + <incDir>
  128 + <pElem>build</pElem>
  129 + <pElem>morfeusz</pElem>
  130 + </incDir>
129 <preprocessorList> 131 <preprocessorList>
130 <Elem>libmorfeusz_EXPORTS</Elem> 132 <Elem>libmorfeusz_EXPORTS</Elem>
131 </preprocessorList> 133 </preprocessorList>
@@ -135,7 +137,11 @@ @@ -135,7 +137,11 @@
135 ex="false" 137 ex="false"
136 tool="1" 138 tool="1"
137 flavor2="4"> 139 flavor2="4">
138 - <ccTool flags="0"> 140 + <ccTool flags="2">
  141 + <incDir>
  142 + <pElem>build</pElem>
  143 + <pElem>morfeusz</pElem>
  144 + </incDir>
139 <preprocessorList> 145 <preprocessorList>
140 <Elem>libmorfeusz_EXPORTS</Elem> 146 <Elem>libmorfeusz_EXPORTS</Elem>
141 </preprocessorList> 147 </preprocessorList>
@@ -149,6 +155,8 @@ @@ -149,6 +155,8 @@
149 flavor2="8"> 155 flavor2="8">
150 <ccTool> 156 <ccTool>
151 <incDir> 157 <incDir>
  158 + <pElem>build</pElem>
  159 + <pElem>morfeusz</pElem>
152 <pElem>build/morfeusz</pElem> 160 <pElem>build/morfeusz</pElem>
153 <pElem>/usr/lib/jvm/default-java/include</pElem> 161 <pElem>/usr/lib/jvm/default-java/include</pElem>
154 <pElem>build/morfeusz/java</pElem> 162 <pElem>build/morfeusz/java</pElem>
@@ -170,8 +178,10 @@ @@ -170,8 +178,10 @@
170 ex="false" 178 ex="false"
171 tool="1" 179 tool="1"
172 flavor2="4"> 180 flavor2="4">
173 - <ccTool flags="0"> 181 + <ccTool flags="2">
174 <incDir> 182 <incDir>
  183 + <pElem>build</pElem>
  184 + <pElem>morfeusz</pElem>
175 <pElem>/usr/lib/perl/5.14/CORE</pElem> 185 <pElem>/usr/lib/perl/5.14/CORE</pElem>
176 <pElem>build/morfeusz/perl</pElem> 186 <pElem>build/morfeusz/perl</pElem>
177 </incDir> 187 </incDir>
@@ -186,6 +196,8 @@ @@ -186,6 +196,8 @@
186 flavor2="8"> 196 flavor2="8">
187 <ccTool> 197 <ccTool>
188 <incDir> 198 <incDir>
  199 + <pElem>build</pElem>
  200 + <pElem>morfeusz</pElem>
189 <pElem>build/morfeusz</pElem> 201 <pElem>build/morfeusz</pElem>
190 <pElem>/usr/include/python2.7</pElem> 202 <pElem>/usr/include/python2.7</pElem>
191 <pElem>build/morfeusz/python</pElem> 203 <pElem>build/morfeusz/python</pElem>
@@ -207,12 +219,16 @@ @@ -207,12 +219,16 @@
207 ex="false" 219 ex="false"
208 tool="1" 220 tool="1"
209 flavor2="4"> 221 flavor2="4">
  222 + <ccTool flags="0">
  223 + </ccTool>
210 </item> 224 </item>
211 <item path="build1/morfeusz/java/swigJAVA.cpp" ex="false" tool="1" flavor2="4"> 225 <item path="build1/morfeusz/java/swigJAVA.cpp" ex="false" tool="1" flavor2="4">
212 </item> 226 </item>
213 <item path="default_fsa.cpp" ex="false" tool="1" flavor2="4"> 227 <item path="default_fsa.cpp" ex="false" tool="1" flavor2="4">
214 <ccTool> 228 <ccTool>
215 <incDir> 229 <incDir>
  230 + <pElem>build</pElem>
  231 + <pElem>morfeusz</pElem>
216 <pElem>build/morfeusz</pElem> 232 <pElem>build/morfeusz</pElem>
217 <pElem>morfeusz/build/morfeusz</pElem> 233 <pElem>morfeusz/build/morfeusz</pElem>
218 </incDir> 234 </incDir>
@@ -224,6 +240,8 @@ @@ -224,6 +240,8 @@
224 <item path="default_synth_fsa.cpp" ex="false" tool="1" flavor2="4"> 240 <item path="default_synth_fsa.cpp" ex="false" tool="1" flavor2="4">
225 <ccTool> 241 <ccTool>
226 <incDir> 242 <incDir>
  243 + <pElem>build</pElem>
  244 + <pElem>morfeusz</pElem>
227 <pElem>build/morfeusz</pElem> 245 <pElem>build/morfeusz</pElem>
228 <pElem>morfeusz/build/morfeusz</pElem> 246 <pElem>morfeusz/build/morfeusz</pElem>
229 </incDir> 247 </incDir>
@@ -235,6 +253,8 @@ @@ -235,6 +253,8 @@
235 <folder path="0"> 253 <folder path="0">
236 <ccTool> 254 <ccTool>
237 <incDir> 255 <incDir>
  256 + <pElem>build</pElem>
  257 + <pElem>morfeusz</pElem>
238 <pElem>build/morfeusz</pElem> 258 <pElem>build/morfeusz</pElem>
239 </incDir> 259 </incDir>
240 </ccTool> 260 </ccTool>
@@ -284,6 +304,8 @@ @@ -284,6 +304,8 @@
284 <folder path="build"> 304 <folder path="build">
285 <ccTool> 305 <ccTool>
286 <incDir> 306 <incDir>
  307 + <pElem>build</pElem>
  308 + <pElem>morfeusz</pElem>
287 <pElem>build/morfeusz</pElem> 309 <pElem>build/morfeusz</pElem>
288 </incDir> 310 </incDir>
289 <preprocessorList> 311 <preprocessorList>
@@ -299,6 +321,8 @@ @@ -299,6 +321,8 @@
299 <folder path="java"> 321 <folder path="java">
300 <ccTool> 322 <ccTool>
301 <incDir> 323 <incDir>
  324 + <pElem>build</pElem>
  325 + <pElem>morfeusz</pElem>
302 <pElem>build/morfeusz</pElem> 326 <pElem>build/morfeusz</pElem>
303 <pElem>build1</pElem> 327 <pElem>build1</pElem>
304 <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem> 328 <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem>
@@ -312,6 +336,8 @@ @@ -312,6 +336,8 @@
312 <folder path="morfeusz/java"> 336 <folder path="morfeusz/java">
313 <ccTool> 337 <ccTool>
314 <incDir> 338 <incDir>
  339 + <pElem>build</pElem>
  340 + <pElem>morfeusz</pElem>
315 <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem> 341 <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem>
316 </incDir> 342 </incDir>
317 <preprocessorList> 343 <preprocessorList>
@@ -322,73 +348,62 @@ @@ -322,73 +348,62 @@
322 <folder path="morfeusz/python"> 348 <folder path="morfeusz/python">
323 <ccTool> 349 <ccTool>
324 <incDir> 350 <incDir>
325 - <pElem>build/morfeusz</pElem> 351 + <pElem>morfeusz</pElem>
326 <pElem>/usr/include/python2.7</pElem> 352 <pElem>/usr/include/python2.7</pElem>
327 </incDir> 353 </incDir>
328 - <preprocessorList>  
329 - <Elem>_OPTIMIZE__=1</Elem>  
330 - <Elem>__PIC__=2</Elem>  
331 - <Elem>__pic__=2</Elem>  
332 - <Elem>libmorfeusz_EXPORTS</Elem>  
333 - <Elem>pymorfeusz_EXPORTS</Elem>  
334 - </preprocessorList>  
335 - <undefinedList>  
336 - <Elem>__GCC_HAVE_DWARF2_CFI_ASM=1</Elem>  
337 - <Elem>__NO_INLINE__</Elem>  
338 - </undefinedList>  
339 </ccTool> 354 </ccTool>
340 </folder> 355 </folder>
341 <item path="morfeusz/CasePatternHelper.cpp" ex="false" tool="1" flavor2="4"> 356 <item path="morfeusz/CasePatternHelper.cpp" ex="false" tool="1" flavor2="4">
342 - <ccTool flags="0"> 357 + <ccTool flags="2">
343 <preprocessorList> 358 <preprocessorList>
344 <Elem>libmorfeusz_EXPORTS</Elem> 359 <Elem>libmorfeusz_EXPORTS</Elem>
345 </preprocessorList> 360 </preprocessorList>
346 </ccTool> 361 </ccTool>
347 </item> 362 </item>
348 <item path="morfeusz/Environment.cpp" ex="false" tool="1" flavor2="4"> 363 <item path="morfeusz/Environment.cpp" ex="false" tool="1" flavor2="4">
349 - <ccTool flags="0"> 364 + <ccTool flags="2">
350 <preprocessorList> 365 <preprocessorList>
351 <Elem>libmorfeusz_EXPORTS</Elem> 366 <Elem>libmorfeusz_EXPORTS</Elem>
352 </preprocessorList> 367 </preprocessorList>
353 </ccTool> 368 </ccTool>
354 </item> 369 </item>
355 <item path="morfeusz/InflexionGraph.cpp" ex="false" tool="1" flavor2="4"> 370 <item path="morfeusz/InflexionGraph.cpp" ex="false" tool="1" flavor2="4">
356 - <ccTool flags="0"> 371 + <ccTool flags="2">
357 <preprocessorList> 372 <preprocessorList>
358 <Elem>libmorfeusz_EXPORTS</Elem> 373 <Elem>libmorfeusz_EXPORTS</Elem>
359 </preprocessorList> 374 </preprocessorList>
360 </ccTool> 375 </ccTool>
361 </item> 376 </item>
362 <item path="morfeusz/Morfeusz.cpp" ex="false" tool="1" flavor2="4"> 377 <item path="morfeusz/Morfeusz.cpp" ex="false" tool="1" flavor2="4">
363 - <ccTool flags="0"> 378 + <ccTool flags="2">
364 <preprocessorList> 379 <preprocessorList>
365 <Elem>libmorfeusz_EXPORTS</Elem> 380 <Elem>libmorfeusz_EXPORTS</Elem>
366 </preprocessorList> 381 </preprocessorList>
367 </ccTool> 382 </ccTool>
368 </item> 383 </item>
369 <item path="morfeusz/MorphDeserializer.cpp" ex="false" tool="1" flavor2="4"> 384 <item path="morfeusz/MorphDeserializer.cpp" ex="false" tool="1" flavor2="4">
370 - <ccTool flags="0"> 385 + <ccTool flags="2">
371 <preprocessorList> 386 <preprocessorList>
372 <Elem>libmorfeusz_EXPORTS</Elem> 387 <Elem>libmorfeusz_EXPORTS</Elem>
373 </preprocessorList> 388 </preprocessorList>
374 </ccTool> 389 </ccTool>
375 </item> 390 </item>
376 <item path="morfeusz/MorphInterpretation.cpp" ex="false" tool="1" flavor2="4"> 391 <item path="morfeusz/MorphInterpretation.cpp" ex="false" tool="1" flavor2="4">
377 - <ccTool flags="0"> 392 + <ccTool flags="2">
378 <preprocessorList> 393 <preprocessorList>
379 <Elem>libmorfeusz_EXPORTS</Elem> 394 <Elem>libmorfeusz_EXPORTS</Elem>
380 </preprocessorList> 395 </preprocessorList>
381 </ccTool> 396 </ccTool>
382 </item> 397 </item>
383 <item path="morfeusz/Qualifiers.cpp" ex="false" tool="1" flavor2="4"> 398 <item path="morfeusz/Qualifiers.cpp" ex="false" tool="1" flavor2="4">
384 - <ccTool flags="0"> 399 + <ccTool flags="2">
385 <preprocessorList> 400 <preprocessorList>
386 <Elem>libmorfeusz_EXPORTS</Elem> 401 <Elem>libmorfeusz_EXPORTS</Elem>
387 </preprocessorList> 402 </preprocessorList>
388 </ccTool> 403 </ccTool>
389 </item> 404 </item>
390 <item path="morfeusz/Tagset.cpp" ex="false" tool="1" flavor2="4"> 405 <item path="morfeusz/Tagset.cpp" ex="false" tool="1" flavor2="4">
391 - <ccTool flags="0"> 406 + <ccTool flags="2">
392 <preprocessorList> 407 <preprocessorList>
393 <Elem>libmorfeusz_EXPORTS</Elem> 408 <Elem>libmorfeusz_EXPORTS</Elem>
394 </preprocessorList> 409 </preprocessorList>
@@ -411,7 +426,7 @@ @@ -411,7 +426,7 @@
411 <item path="morfeusz/cli/cli.cpp" ex="false" tool="1" flavor2="4"> 426 <item path="morfeusz/cli/cli.cpp" ex="false" tool="1" flavor2="4">
412 </item> 427 </item>
413 <item path="morfeusz/const.cpp" ex="false" tool="1" flavor2="4"> 428 <item path="morfeusz/const.cpp" ex="false" tool="1" flavor2="4">
414 - <ccTool flags="0"> 429 + <ccTool flags="2">
415 <preprocessorList> 430 <preprocessorList>
416 <Elem>libmorfeusz_EXPORTS</Elem> 431 <Elem>libmorfeusz_EXPORTS</Elem>
417 </preprocessorList> 432 </preprocessorList>
@@ -475,8 +490,12 @@ @@ -475,8 +490,12 @@
475 </ccTool> 490 </ccTool>
476 </item> 491 </item>
477 <item path="morfeusz/morfeusz_analyzer.cpp" ex="false" tool="1" flavor2="4"> 492 <item path="morfeusz/morfeusz_analyzer.cpp" ex="false" tool="1" flavor2="4">
  493 + <ccTool flags="1">
  494 + </ccTool>
478 </item> 495 </item>
479 <item path="morfeusz/morfeusz_generator.cpp" ex="false" tool="1" flavor2="4"> 496 <item path="morfeusz/morfeusz_generator.cpp" ex="false" tool="1" flavor2="4">
  497 + <ccTool flags="1">
  498 + </ccTool>
480 </item> 499 </item>
481 <item path="morfeusz/segrules/SegrulesFSA.cpp" ex="false" tool="1" flavor2="4"> 500 <item path="morfeusz/segrules/SegrulesFSA.cpp" ex="false" tool="1" flavor2="4">
482 </item> 501 </item>