diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java index 72a5ae3b3..97d47a310 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/FullDataArrayAccessor.java @@ -112,8 +112,8 @@ public class FullDataArrayAccessor implements IFullDataAccessor } /** - * Takes a higher detail {@link FullDataArrayAccessor}'s to a lower detail. - * @param fullDataAccessor must be larger than this {@link FullDataArrayAccessor} and its width must a power of two + * Takes a higher detail {@link FullDataArrayAccessor}'s and converts the data to a lower detail level. + * @param fullDataAccessor must be larger than this {@link FullDataArrayAccessor} and its width must a power of two larger (example: this.width = 4, other.width = 8) */ public void downsampleFrom(FullDataArrayAccessor fullDataAccessor) { diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java index bf1ae3490..f6a0d539d 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java @@ -3,9 +3,9 @@ package com.seibel.lod.core.dataObjects.fullData.sources; public interface IIncompleteFullDataSource extends IFullDataSource { /** - * Overwrites data in this object with non-null data from the input {@link IFullDataSource}. + * Overwrites data in this object with non-null data from the input {@link IFullDataSource}.

* - * This can be used to either merge same sized data sources or + * This can be used to either merge same sized data sources or downsample to */ void sampleFrom(IFullDataSource fullDataSource); diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/SpottyFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/SpottyFullDataSource.java index 520b1bd54..b025f6bdc 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/SpottyFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/SpottyFullDataSource.java @@ -330,13 +330,13 @@ public class SpottyFullDataSource extends FullDataArrayAccessor implements IInco } } - private void sampleFrom(CompleteFullDataSource fullSource) + private void sampleFrom(CompleteFullDataSource completeSource) { - DhSectionPos pos = fullSource.getSectionPos(); + DhSectionPos pos = completeSource.getSectionPos(); this.isEmpty = false; - this.downsampleFrom(fullSource); + this.downsampleFrom(completeSource); - if (this.getDataDetailLevel() > this.sectionPos.sectionDetailLevel) + if (this.getDataDetailLevel() > this.sectionPos.sectionDetailLevel) // TODO what does this mean? { DhLodPos thisLodPos = this.sectionPos.getCorner(this.getDataDetailLevel()); DhLodPos dataLodPos = pos.getCorner(this.getDataDetailLevel()); @@ -406,7 +406,7 @@ public class SpottyFullDataSource extends FullDataArrayAccessor implements IInco @Override public DhSectionPos getSectionPos() { return this.sectionPos; } @Override - public byte getDataDetailLevel() { return (byte) (this.sectionPos.sectionDetailLevel -SECTION_SIZE_OFFSET); } + public byte getDataDetailLevel() { return (byte) (this.sectionPos.sectionDetailLevel - SECTION_SIZE_OFFSET); } @Override public byte getDataVersion() { return LATEST_VERSION; }