Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java @ 4842:97a0fa4dff8e
Use isDebugEnabled() in S/Q Measurement factory.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 23 Jan 2013 17:36:18 +0100 |
parents | ac9a3d9576b4 |
children | 14db045d6368 |
comparison
equal
deleted
inserted
replaced
4841:ad0990a82ab8 | 4842:97a0fa4dff8e |
---|---|
369 } | 369 } |
370 | 370 |
371 | 371 |
372 protected static Measurement processSameDate(List<Measurement> measurements) { | 372 protected static Measurement processSameDate(List<Measurement> measurements) { |
373 int N = measurements.size(); | 373 int N = measurements.size(); |
374 if (N > 0) { | 374 |
375 boolean debug = log.isDebugEnabled(); | |
376 if (debug && N > 0) { | |
375 log.debug("process same date for Q: " + measurements.get(0).Q()); | 377 log.debug("process same date for Q: " + measurements.get(0).Q()); |
376 } | 378 } |
377 if (N == 1) { | 379 if (N == 1) { |
378 Measurement current = measurements.get(0); | 380 Measurement current = measurements.get(0); |
379 double left = current.get("UFERABLINKS"); | 381 double left = current.get("UFERABLINKS"); |
401 Measurement next = measurements.get(i+1); | 403 Measurement next = measurements.get(i+1); |
402 double distPrev = prev.get("UFERABST"); | 404 double distPrev = prev.get("UFERABST"); |
403 double distNext = next.get("UFERABST"); | 405 double distNext = next.get("UFERABST"); |
404 current.set("EFFWIDTH", 0.5*(distNext - distPrev)); | 406 current.set("EFFWIDTH", 0.5*(distNext - distPrev)); |
405 } | 407 } |
406 log.debug("effective width: " + current.get("EFFWIDTH")); | 408 if (debug) { |
409 log.debug("effective width: " + current.get("EFFWIDTH")); | |
410 } | |
407 } | 411 } |
408 } | 412 } |
409 | 413 |
410 double sumSandF = 0d; | 414 double sumSandF = 0d; |
411 double sumCoarseF = 0d; | 415 double sumCoarseF = 0d; |
425 double scale = effWidth*gt; | 429 double scale = effWidth*gt; |
426 sumSandF += scale*sandF; | 430 sumSandF += scale*sandF; |
427 sumCoarseF += scale*coarseF; | 431 sumCoarseF += scale*coarseF; |
428 sumGravelF += scale*gravelF; | 432 sumGravelF += scale*gravelF; |
429 sumNorm += scale; | 433 sumNorm += scale; |
430 log.debug("fractions - s: " + | 434 if (debug) { |
431 sandF + " c: " + | 435 log.debug("fractions - s: " + |
432 coarseF + " g: " + | 436 sandF + " c: " + |
433 gravelF); | 437 coarseF + " g: " + |
434 log.debug("scale: " + scale + " = " + effWidth + " * " + gt); | 438 gravelF); |
439 log.debug("scale: " + scale + " = " + effWidth + " * " + gt); | |
440 } | |
435 } | 441 } |
436 | 442 |
437 Map<String, Object> data = | 443 Map<String, Object> data = |
438 new HashMap<String, Object>(measurements.get(0).getData()); | 444 new HashMap<String, Object>(measurements.get(0).getData()); |
439 | 445 |
442 sumNorm = 1d/sumNorm; | 448 sumNorm = 1d/sumNorm; |
443 | 449 |
444 m.set("BL_S", sumNorm*sumSandF); | 450 m.set("BL_S", sumNorm*sumSandF); |
445 m.set("BL_G", sumNorm*sumGravelF); | 451 m.set("BL_G", sumNorm*sumGravelF); |
446 m.set("BL_C", sumNorm*sumCoarseF); | 452 m.set("BL_C", sumNorm*sumCoarseF); |
447 log.debug("BL_S: " + m.get("BL_S") + " BL_G: " + m.get("BL_G") + " BL_C: " + m.get("BL_C")); | 453 if (debug) { |
454 log.debug( | |
455 "BL_S: " + m.get("BL_S") + | |
456 " BL_G: " + m.get("BL_G") + | |
457 " BL_C: " + m.get("BL_C")); | |
458 } | |
448 return m; | 459 return m; |
449 } | 460 } |
450 | 461 |
451 | 462 |
452 private static final boolean equalDate(Date a, Date b) { | 463 private static final boolean equalDate(Date a, Date b) { |