/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision aadb17f4

Added by Andreas Kohlbecker over 6 years ago

ID aadb17f495b8632eb2eabc699def3787357977ef
Parent 4344fddf
Child 0d0d2537

#5191 fixing process monitor updating in TransmissionEngine
this is most probably not fixing the ticket but helps providing more reliable monitoring

     	 */
     	public boolean equalsByShallowCompare(ReferencedEntityBase other) {
             if(this.getCitation().getId() != other.getCitation().getId()
     	    int thisCitationId = -1;
     	    int otherCitationId = -1;
     	    if(this.getCitation() != null) {
     	        thisCitationId = this.getCitation().getId();
+    	    }
     	    if(other.getCitation() != null) {
     	        otherCitationId = other.getCitation().getId();
+            }
             if(thisCitationId != otherCitationId
                     || !StringUtils.equals(this.getCitationMicroReference(), other.getCitationMicroReference())
                     || !StringUtils.equals(this.getOriginalNameString(), other.getOriginalNameString())
                             ){

         private final List<OrderHint> emptyOrderHints = new ArrayList<OrderHint>(0);
         int byRankTicks = 300;
         int byAreasTicks = 100;
         /**
          * byAreaIgnoreStatusList contains by default:
-...
                 classifications.add(classification);
+            }
             int aggregationWorkTicks = mode.equals(AggregationMode.byAreasAndRanks) ? 400 : 200;
             int aggregationWorkTicks;
             switch(mode){
             case byAreasAndRanks:
                 aggregationWorkTicks = byAreasTicks + byRankTicks;
                 break;
             case byAreas:
                 aggregationWorkTicks = byAreasTicks;
                 break;
             case byRanks:
                 aggregationWorkTicks = byRankTicks;
                 break;
             default:
                 aggregationWorkTicks = 0;
                 break;
+            }
             // take start time for performance testing
             // NOTE: use ONLY_FISRT_BATCH = true to measure only one batch
             double start = System.currentTimeMillis();
             monitor.beginTask("Accumulating distributions", (classifications.size() * aggregationWorkTicks) + 1 );
             updatePriorities();
             monitor.worked(1);
             List<Rank> ranks = rankInterval(lowerRank, upperRank);
             monitor.worked(1);
             for(Classification _classification : classifications) {
                 ClassificationLookupDTO classificationLookupDao = classificationService.classificationLookup(_classification);
-...
                 monitor.subTask("Accumulating distributions to super areas for " + _classification.getTitleCache());
                 if (mode.equals(AggregationMode.byAreas) || mode.equals(AggregationMode.byAreasAndRanks)) {
                     accumulateByArea(superAreas, classificationLookupDao, new SubProgressMonitor(monitor, 200), true);
                     accumulateByArea(superAreas, classificationLookupDao, new SubProgressMonitor(monitor, byAreasTicks), true);
+                }
                 monitor.subTask("Accumulating distributions to higher ranks for " + _classification.getTitleCache());
-...
                 double start3 = System.currentTimeMillis();
                 if (mode.equals(AggregationMode.byRanks) || mode.equals(AggregationMode.byAreasAndRanks)) {
                     accumulateByRank(ranks, classificationLookupDao, new SubProgressMonitor(monitor, 200), mode.equals(AggregationMode.byRanks));
                     accumulateByRank(ranks, classificationLookupDao, new SubProgressMonitor(monitor, byRankTicks), mode.equals(AggregationMode.byRanks));
+                }
                 double end3 = System.currentTimeMillis();
-...
                     break;
+                }
+            }
             monitor.done();
+        }
-...
         protected void accumulateByRank(List<Rank> rankInterval, ClassificationLookupDTO classificationLookupDao,  IProgressMonitor subMonitor, boolean doClearDescriptions) {
             int batchSize = 500;
             int ticksPerRank = 100;
             TransactionStatus txStatus = startTransaction(false);
-...
             List<Rank> ranks = rankInterval;
             int ticksPerRank = 100;
             subMonitor.beginTask("Accumulating by rank", ranks.size() * ticksPerRank);
             for (Rank rank : ranks) {
-...
                     logger.debug("accumulateByRank() - at Rank '" + termToString(rank) + "'");
+                }
                 SubProgressMonitor taxonSubMonitor = null;
                 Set<Integer> taxonIdsPerRank = classificationLookupDao.getTaxonIdByRank().get(rank);
                 if(taxonIdsPerRank == null || taxonIdsPerRank.isEmpty()) {
                 int taxonCountperRank = taxonIdsPerRank != null ? taxonIdsPerRank.size() : 0;
                 SubProgressMonitor taxonSubMonitor = new SubProgressMonitor(subMonitor, ticksPerRank);
                 taxonSubMonitor.beginTask("Accumulating by rank " + termToString(rank), taxonCountperRank);
                 if(taxonCountperRank == 0) {
                     taxonSubMonitor.done();
                     continue;
+                }
                 Iterator<Integer> taxonIdIterator = taxonIdsPerRank.iterator();
                 while (taxonIdIterator.hasNext()) {
-...
                     taxa = taxonService.loadByIds(taxonIds, null);
                     if(taxonSubMonitor == null) {
                         taxonSubMonitor = new SubProgressMonitor(subMonitor, ticksPerRank);
                         taxonSubMonitor.beginTask("Accumulating by rank " + termToString(rank), taxa.size());
+                    }
     //                if(logger.isDebugEnabled()){
     //                           logger.debug("accumulateByRank() - taxon " + taxonPager.getFirstRecord() + " to " + taxonPager.getLastRecord() + " of " + taxonPager.getCount() + "]");
     //                }
-...
+                    }
                 } // next batch
                 if(taxonSubMonitor != null) { // TODO taxonSubpager, this check should not be needed
                     taxonSubMonitor.done();
+                }
                 taxonSubMonitor.done();
                 subMonitor.worked(1);
                 if(ONLY_FISRT_BATCH) {
-...
+                }
             } // next Rank
             logger.info("accumulateByRank() - done");
             subMonitor.done();
+        }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision aadb17f4

Added by Andreas Kohlbecker over 6 years ago