View | Details | Raw Unified | Return to bug 472
Collapse All | Expand All

(-)a/src/simulator/ns2-calendar-scheduler.cc (-4 / +4 lines)
 Lines 58-64    Link Here 
58
	round_num_ = 0; 
58
	round_num_ = 0; 
59
	time_to_newwidth_ = adjust_new_width_interval_;
59
	time_to_newwidth_ = adjust_new_width_interval_;
60
	cal_clock_ = Scheduler::EventKey ();
60
	cal_clock_ = Scheduler::EventKey ();
61
	reinit(4, 1.0, cal_clock_);
61
	reinit(4, 1, cal_clock_);
62
}
62
}
63
Ns2CalendarScheduler::~Ns2CalendarScheduler ()
63
Ns2CalendarScheduler::~Ns2CalendarScheduler ()
64
{
64
{
 Lines 388-394    Link Here 
388
	Bucket *oldb = buckets_;
388
	Bucket *oldb = buckets_;
389
	int oldn = nbuckets_;
389
	int oldn = nbuckets_;
390
390
391
	reinit(newsize, bwidth, start);
391
	reinit(newsize, (uint64_t) bwidth, start);
392
392
393
	// copy events to new buckets
393
	// copy events to new buckets
394
	int i;
394
	int i;
 Lines 469-475    Link Here 
469
{
469
{
470
	if (adjust_new_width_interval_) {
470
	if (adjust_new_width_interval_) {
471
		time_to_newwidth_ = adjust_new_width_interval_;
471
		time_to_newwidth_ = adjust_new_width_interval_;
472
		if (avg_gap_ > 0) return avg_gap_*4.0;
472
		if (avg_gap_ > 0) return static_cast<uint64_t> (avg_gap_*4.0);
473
	}
473
	}
474
	int i;
474
	int i;
475
	int max_bucket = 0; // index of the fullest bucket
475
	int max_bucket = 0; // index of the fullest bucket
 Lines 485-491    Link Here 
485
		- buckets_[max_bucket].list_->event.key.m_ts;
485
		- buckets_[max_bucket].list_->event.key.m_ts;
486
	
486
	
487
	nw /= ((newsize < nsamples) ? newsize : nsamples); // min (newsize, nsamples)
487
	nw /= ((newsize < nsamples) ? newsize : nsamples); // min (newsize, nsamples)
488
	nw *= 4.0;
488
	nw *= 4;
489
489
490
	nw = std::max (nw, min_bin_width_);
490
	nw = std::max (nw, min_bin_width_);
491
	
491
	

Return to bug 472