diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-06 14:27:13 +0100 | 
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-19 16:50:16 +0100 | 
| commit | 673bf2fd8fd40053ac6baba229953f2e58b7cb42 (patch) | |
| tree | f2f92bea3ff44b863c310eb8ac70550cde3ff461 | |
| parent | d6c0f64358a75565e70905d11c47511329ec3c53 (diff) | |
| download | astra-673bf2fd8fd40053ac6baba229953f2e58b7cb42.tar.gz astra-673bf2fd8fd40053ac6baba229953f2e58b7cb42.tar.bz2 astra-673bf2fd8fd40053ac6baba229953f2e58b7cb42.tar.xz astra-673bf2fd8fd40053ac6baba229953f2e58b7cb42.zip | |
Fix whitespace
| -rw-r--r-- | src/CompositeGeometryManager.cpp | 42 | 
1 files changed, 21 insertions, 21 deletions
| diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index 41f6319..eed06c4 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -305,37 +305,37 @@ CCompositeGeometryManager::CPart* CCompositeGeometryManager::CVolumePart::reduce  static size_t ceildiv(size_t a, size_t b) { -    return (a + b - 1) / b; +	return (a + b - 1) / b;  }  static size_t computeVerticalSplit(size_t maxBlock, int div, size_t sliceCount)  { -    size_t blockSize = maxBlock; -    size_t blockCount = ceildiv(sliceCount, blockSize); +	size_t blockSize = maxBlock; +	size_t blockCount = ceildiv(sliceCount, blockSize); -    // Increase number of blocks to be divisible by div -    size_t divCount = div * ceildiv(blockCount, div); +	// Increase number of blocks to be divisible by div +	size_t divCount = div * ceildiv(blockCount, div); -    // If divCount is above sqrt(number of slices), then -    // we can't guarantee divisibility by div, but let's try anyway -    if (ceildiv(sliceCount, ceildiv(sliceCount, divCount)) % div == 0) { -        blockCount = divCount; -    } else { -        // If divisibility isn't achievable, we may want to optimize -        // differently. -        // TODO: Figure out how to model and optimize this. -    } +	// If divCount is above sqrt(number of slices), then +	// we can't guarantee divisibility by div, but let's try anyway +	if (ceildiv(sliceCount, ceildiv(sliceCount, divCount)) % div == 0) { +		blockCount = divCount; +	} else { +		// If divisibility isn't achievable, we may want to optimize +		// differently. +		// TODO: Figure out how to model and optimize this. +	} -    // Final adjustment to make blocks more evenly sized -    // (This can't make the blocks larger) -    blockSize = ceildiv(sliceCount, blockCount);  +	// Final adjustment to make blocks more evenly sized +	// (This can't make the blocks larger) +	blockSize = ceildiv(sliceCount, blockCount); -    ASTRA_DEBUG("%ld %ld -> %ld * %ld", sliceCount, maxBlock, blockCount, blockSize); +	ASTRA_DEBUG("%ld %ld -> %ld * %ld", sliceCount, maxBlock, blockCount, blockSize); -    assert(blockSize <= maxBlock); -    assert((divCount * divCount > sliceCount) || (blockCount % div) == 0); +	assert(blockSize <= maxBlock); +	assert((divCount * divCount > sliceCount) || (blockCount % div) == 0); -    return blockSize; +	return blockSize;  }  template<class V, class P> | 
