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