conflict_resolution
stringlengths
27
16k
<<<<<<< /* THREADING */ ======= /* VIEWING DISTANCE */ private static final int[] VIEWING_DISTANCES = {(Integer) SettingsManager.getInstance().getUserSetting("Game.Graphics.viewingDistanceNear"), (Integer) SettingsManager.getInstance().getUserSetting("Game.Graphics.viewingDistanceModerate"), ...
<<<<<<< return sequenceForPosition(ec, Long.MAX_VALUE, false); ======= Sequence sequence1 = this.sequence; if (sequence1 != null) { for (int i = 0; i < 128; i++) { long address = writePosition.getVolatileValue(); if (address == 0) ...
<<<<<<< import org.terasology.asset.AssetManager; import org.terasology.asset.AssetType; import org.terasology.asset.AssetUri; ======= >>>>>>> <<<<<<< import org.terasology.context.Context; ======= import org.terasology.assets.ResourceUrn; >>>>>>> import org.terasology.assets.ResourceUrn; import org.terasology.c...
<<<<<<< import org.terasology.asset.AssetManager; import org.terasology.asset.AssetType; import org.terasology.context.Context; import org.terasology.context.internal.ContextImpl; ======= import org.terasology.assets.management.AssetManager; >>>>>>> import org.terasology.assets.management.AssetManager; import org.te...
<<<<<<< import javax.vecmath.Vector3f; import java.io.InputStream; ======= >>>>>>> import javax.vecmath.Vector3f;
<<<<<<< import org.newdawn.slick.openal.SoundStore; import org.terasology.entitySystem.EntityManager; ======= >>>>>>> import org.terasology.entitySystem.EntityManager;
<<<<<<< import com.google.common.collect.MapMaker; import com.google.common.collect.Sets; ======= import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; >>>>>>> import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; import com.google.common.collect.Sets; <<<<<...
<<<<<<< ======= private static String getNewTitle(String title) { String newTitle = title.substring(0, getPositionOfLastDigit(title)); int fileNumber = getLastNumber(title); fileNumber++; return (newTitle + " " + fileNumber); } private static SplashScreen configureSplashSc...
<<<<<<< ======= import javax.vecmath.Vector3f; import org.terasology.componentSystem.block.BlockEntityRegistry; >>>>>>> <<<<<<< worldProvider.setBlock(blockPos, BlockManager.getInstance().getAir(), currentBlock); ======= worldProvider.setBlock(blockPos...
<<<<<<< double noise = _noiseGenerator.fBm(i * 0.05, j * 0.05, _parent.getWorldProvider().getTimeInDays()); ======= double noise = _noiseGenerator.fBm(i * 0.008, j * 0.008, _parent.getWorldProvider().getTime()); >>>>>>> double noise = _noiseGenerator.fBm(i * 0.008, j *...
<<<<<<< import com.google.common.collect.Lists; ======= import static org.lwjgl.opengl.GL11.GL_BLEND; import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; import static org.lwjgl.opengl.GL11.GL_FILL; import static org.lwjgl.opengl.GL11.GL_FRONT_AND_BACK; import static org.lwjgl.opengl.GL11.GL_LIGHT0; import stati...
<<<<<<< import net.openhft.chronicle.Chronicle; import net.openhft.chronicle.ChronicleQueueBuilder; import net.openhft.chronicle.Excerpt; import net.openhft.chronicle.ExcerptAppender; import net.openhft.chronicle.ExcerptCommon; import net.openhft.chronicle.ExcerptComparator; import net.openhft.chronicle.ExcerptTailer; ...
<<<<<<< import org.terasology.rendering.dag.nodes.CopyImageToScreenNode; import org.terasology.rendering.openvrprovider.OpenVRProvider; import org.lwjgl.opengl.GL11; ======= >>>>>>> import org.terasology.rendering.dag.nodes.CopyImageToScreenNode; import org.terasology.rendering.openvrprovider.OpenVRProvider;
<<<<<<< this.entityManager = CoreRegistry.get(EntityManager.class); this.worldProvider = CoreRegistry.get(WorldProvider.class); this.effectsTexture = AssetManager.loadTexture("engine:effects"); ======= entityManager = CoreRegistry.get(EntityManager.class); worldProvider = CoreR...
<<<<<<< public class UIHeadsUpDisplay extends UIDisplayWindow { ======= public class UIHeadsUpDisplay extends UIDisplayRenderer implements EventHandlerSystem { protected EntityManager entityManager; >>>>>>> public class UIHeadsUpDisplay extends UIDisplayWindow implements EventHandlerSystem { protected Enti...
<<<<<<< import org.terasology.logic.characters.events.DeathEvent; import org.terasology.logic.health.DamageEvent; ======= import org.terasology.game.CoreRegistry; >>>>>>> import org.terasology.game.CoreRegistry; <<<<<<< import org.terasology.logic.health.NoHealthEvent; ======= import org.terasology.logic.health.D...
<<<<<<< import com.google.common.collect.Lists; import org.terasology.logic.world.BlockUpdate; import org.terasology.logic.world.WorldProvider; import org.terasology.model.blocks.Block; ======= >>>>>>> import com.google.common.collect.Lists; import org.terasology.logic.world.BlockUpdate; import org.terasology.logic...
<<<<<<< import org.terasology.context.Context; import org.terasology.engine.SimpleUri; import org.terasology.engine.module.ModuleManager; import org.terasology.engine.paths.PathManager; ======= import org.terasology.engine.context.Context; import org.terasology.engine.core.SimpleUri; import org.terasology.engine.core...
<<<<<<< return String.format("world (biome: %s, time: %.2f, exposure: %.2f, sun: %.2f, cache: %d, dirty: %d, ign: %d, vis: %d, tri: %d, empty: %d, !ready: %d, seed: \"%s\", title: \"%s\")", getPlayerBiome(), _worldProvider.getTime(), PostProcessingRenderer.getInstance().getExposure(), _skysphere.getSunPosAngle(...
<<<<<<< final UIButton _exitButton; final UIButton _optionsButton; final UIButton _startButton; ======= private final UIButton _exitButton; private final UIButton _startButton; private final UIButton _configButton; >>>>>>> private final UIButton _exitButton; final UIButton _optionsBut...
<<<<<<< import org.terasology.logic.manager.GUIManager; import org.terasology.logic.world.BlockEntityRegistry; import org.terasology.logic.world.WorldProvider; ======= import org.terasology.logic.world.IWorldProvider; >>>>>>> import org.terasology.logic.world.BlockEntityRegistry; import org.terasology.logic.world.Wo...
<<<<<<< import org.terasology.logic.common.DisplayNameComponent; import org.terasology.registry.CoreRegistry; ======= >>>>>>> <<<<<<< private EntityRef globalEntity; public BehaviorSystem() { CoreRegistry.put(BehaviorSystem.class, this); } ======= >>>>>>>
<<<<<<< import java.util.HashMap; ======= >>>>>>> import java.util.HashMap; <<<<<<< import org.lwjgl.opengl.Display; import org.terasology.rendering.gui.framework.style.UIStyle; ======= >>>>>>> import org.lwjgl.opengl.Display; import org.terasology.rendering.gui.framework.style.UIStyle;
<<<<<<< ======= import javax.vecmath.Vector3f; import org.terasology.componentSystem.block.BlockEntityRegistry; >>>>>>> <<<<<<< private WorldProvider worldProvider; ======= private IWorldProvider worldProvider; >>>>>>> private WorldProvider worldProvider; <<<<<<< ...
<<<<<<< /* * Copyright 2013 MovingBlocks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or ...
<<<<<<< playerCamera = new OpenVRStereoCamera(vrProvider); /* * The origin of OpenVR's coordinate system lies on the ground of the user. We have to move this origin * such that the ground plane of the rendering system and the ground plane of the room the V...
<<<<<<< ======= @Override public boolean isTheDefaultInstance() { return this.equals(defaultInstance); } /** * Instances of this class bind a texture to a texture unit. The integer identifying * the texture unit is then passed to a shader program using the material/parameter *...
<<<<<<< import org.terasology.context.Context; import org.terasology.context.internal.ContextImpl; ======= import org.terasology.assets.management.AssetManager; >>>>>>> import org.terasology.assets.management.AssetManager; import org.terasology.context.Context; import org.terasology.context.internal.ContextImpl; <<...
<<<<<<< public void postInitialise(Context context) { context.put(RenderingSubsystemFactory.class, new HeadlessRenderingSubsystemFactory()); ======= public void initialise(Config config) { } @Override public void registerCoreAssetTypes(ModuleAwareAssetTypeManager assetTypeManager) { ...
<<<<<<< import org.terasology.asset.AssetFactory; import org.terasology.asset.AssetManager; import org.terasology.asset.AssetManagerImpl; import org.terasology.asset.AssetType; import org.terasology.asset.AssetUri; import org.terasology.context.internal.ContextImpl; import org.terasology.engine.bootstrap.EntitySystemSe...
<<<<<<< import org.terasology.components.*; import org.terasology.components.world.BlockComponent; import org.terasology.components.world.BlockItemComponent; import org.terasology.components.world.LocationComponent; import org.terasology.entitySystem.*; ======= import org.terasology.componentSystem.block.BlockEntityR...
<<<<<<< import org.eaxy.Document; import org.eaxy.Element; import org.eaxy.ElementSet; import org.eaxy.NonMatchingPathException; import org.eaxy.Xml; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.math.geom.Matrix4f; import org.terasology.math.geom.Quat4f; import org.terasology.math.geom...
<<<<<<< import org.terasology.identity.storageServiceClient.StorageServiceWorker; ======= import org.terasology.i18n.TranslationSystem; >>>>>>> import org.terasology.identity.storageServiceClient.StorageServiceWorker; import org.terasology.i18n.TranslationSystem;
<<<<<<< @RegisterComponentSystem() public class BookshelfHandler implements EventHandlerSystem{ ======= public class BookshelfHandler implements EventHandlerSystem { @Override >>>>>>> @RegisterComponentSystem() public class BookshelfHandler implements EventHandlerSystem{ @Override <<<<<<< @Override ...
<<<<<<< import com.google.gson.Gson; ======= import org.joml.Vector3f; >>>>>>> import com.google.gson.Gson; import org.joml.Vector3f; <<<<<<< import org.terasology.engine.TerasologyConstants; import org.terasology.math.geom.Vector3f; ======= import org.terasology.engine.module.ModuleContext; >>>>>>> import org.t...
<<<<<<< import org.terasology.componentSystem.controllers.LocalPlayerSystem; import org.terasology.components.LocalPlayerComponent; import org.terasology.components.world.LocationComponent; ======= import org.terasology.componentSystem.action.*; import org.terasology.componentSystem.block.BlockEntityRegistry; import ...
<<<<<<< context.put(ModuleManager.class, moduleManager); context.put(Config.class, new Config()); context.put(AssetManager.class, new AssetManagerImpl(moduleManager.getEnvironment())); context.put(NetworkSystem.class, networkSystem); ======= CoreRegistry.put(ModuleManager.class...
<<<<<<< ======= import org.terasology.model.blocks.Block; import org.terasology.utilities.MathHelper; >>>>>>> import org.terasology.utilities.MathHelper;
<<<<<<< ======= private static final Vector3f[] NEIGHBORS4 = {new Vector3f(-1, 0, 0), new Vector3f(1, 0, 0), new Vector3f(0, 0, 1), new Vector3f(0, 0, -1)}; private static final Vector3f[] NEIGHBORS6 = {new Vector3f(0, -1, 0), new Vector3f(0, 1, 0), new Vector3f(-1, 0, 0), new Vector3f(1, 0, 0), new Vector3f(...
<<<<<<< ======= import org.terasology.rendering.nui.baseWidgets.UIImage; import org.terasology.rendering.nui.baseWidgets.UILabel; import org.terasology.rendering.nui.baseWidgets.UISpace; import org.terasology.rendering.nui.layout.ArbitraryLayout; import org.terasology.rendering.nui.layout.ColumnLayout; import org.ter...
<<<<<<< public WorldRenderer getActiveWorldRenderer() { return null; } public EntityManager getEntityManager() { return null; } ======= >>>>>>> public EntityManager getEntityManager() { return null; }
<<<<<<< ======= /** * Updates the list of chunks around the player. * * @return True if the list was changed */ public boolean updateChunksInProximity(Region3i newRegion) { if (!newRegion.equals(renderRegion)) { Iterator<Vector3i> removeChunks = renderRegion.subtract(ne...
<<<<<<< ======= import org.terasology.componentSystem.block.BlockEntitySystem; import org.terasology.componentSystem.characters.CharacterMovementSystem; import org.terasology.componentSystem.characters.CharacterSoundSystem; import org.terasology.componentSystem.common.HealthSystem; import org.terasology.componentSyst...
<<<<<<< Vector3f cameraPosition = CoreRegistry.get(WorldRenderer.class).getActiveCamera().getPosition(); GL11.glTranslated(gp.x - cameraPosition.x, gp.y - cameraPosition.y, gp.z - cameraPosition.z); ======= Vector3d cameraPosition = CoreRegistry.get(WorldRenderer.class)...
<<<<<<< import org.terasology.asset.AssetManager; import org.terasology.context.Context; import org.terasology.context.internal.ContextImpl; ======= import org.terasology.assets.format.AssetDataFile; import org.terasology.assets.management.AssetManager; >>>>>>> import org.terasology.assets.format.AssetDataFile; impo...
<<<<<<< ======= private SingleChronicleQueueBuilder builder; private long appendTimeout = 1_000; >>>>>>> private SingleChronicleQueueBuilder builder; private long appendTimeout = 1_000; <<<<<<< this.mappedBytes = ((MappedBytes) wire.bytes()).withSizes(chunkSize, overlapSize); ======= ...
<<<<<<< import javax.vecmath.Vector2f; ======= import org.terasology.asset.AssetType; import org.terasology.asset.AssetUri; import org.terasology.components.CuredComponent; >>>>>>> import javax.vecmath.Vector2f; import org.terasology.components.CuredComponent;
<<<<<<< import org.terasology.game.modes.IGameMode; import org.terasology.game.modes.ModeMainMenu; import org.terasology.game.modes.ModePlayGame; import org.terasology.logic.characters.Player; ======= >>>>>>> import org.terasology.game.modes.IGameMode; import org.terasology.game.modes.ModeMainMenu; import org.teraso...
<<<<<<< import org.terasology.model.blocks.BlockManager; import org.terasology.rendering.shader.ShaderParameters; ======= import org.terasology.model.blocks.management.BlockManager; >>>>>>> import org.terasology.model.blocks.management.BlockManager; import org.terasology.rendering.shader.ShaderParameters;
<<<<<<< nextSynchronous = builder.synchronous(); ======= capacityAddr = limitAddr; nextSynchronous = config.synchronous(); >>>>>>> nextSynchronous = builder.synchronous(); capacityAddr = limitAddr;
<<<<<<< ======= import org.terasology.config.Config; >>>>>>> import org.terasology.config.Config;
<<<<<<< import org.terasology.asset.AssetFactory; import org.terasology.asset.AssetManager; import org.terasology.asset.AssetManagerImpl; import org.terasology.asset.AssetType; import org.terasology.asset.AssetUri; import org.terasology.asset.Assets; import org.terasology.context.Context; import org.terasology.context....
<<<<<<< import org.terasology.components.ItemComponent; import org.terasology.components.LocalPlayerComponent; import org.terasology.components.world.LocationComponent; import org.terasology.components.MinionBarComponent; ======= import org.terasology.components.*; import org.terasology.mods.miniions.components.Minio...
<<<<<<< import org.terasology.rendering.gui.framework.IInputDataElement; ======= import org.terasology.logic.manager.AudioManager; >>>>>>> import org.terasology.rendering.gui.framework.IInputDataElement; import org.terasology.logic.manager.AudioManager;
<<<<<<< import org.terasology.rendering.nui.UIWidget; import org.terasology.rendering.nui.asset.UIElement; import org.terasology.rendering.nui.events.NUICharEvent; import org.terasology.rendering.nui.events.NUIKeyEvent; ======= >>>>>>> <<<<<<< if (canvas.processMouseWheel(event.getWheelTurns(), mouse.getPo...
<<<<<<< byte blockId = type.getBlockIdFor(attachmentSide, direction); if (blockId == 0) return false; worldProvider.setBlock(blockPos.x, blockPos.y, blockPos.z, blockId, true, true); ======= placeBlock(blockPos, type.getBlockIdFor(attachmentSide, direct...
<<<<<<< /*GAME MODES*/ public enum GameMode { undefined, mainMenu, runGame }; static GameMode _state = GameMode.mainMenu; private static Map<GameMode,IGameMode> _gameModes = Collections.synchronizedMap(new EnumMap<GameMode,IGameMode>(GameMode.class)); ======= /* GUI */ private ...
<<<<<<< public void spawnTest() { Player player = Terasology.getInstance().getActiveWorldRenderer().getPlayer(); GelatinousCubeFactory factory = new GelatinousCubeFactory(); factory.setEntityManager(Terasology.getInstance().getCurrentGameState().getEntityManager()); ...
<<<<<<< import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; ======= import org.lwjgl.opengl.GL11; >>>>>>> import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL13; <<<<<<< /*Stars*/ public static IntBuffer textureId = BufferUtils.cr...
<<<<<<< import org.terasology.context.Context; import org.terasology.context.internal.ContextImpl; import org.terasology.engine.bootstrap.EntitySystemSetupUtil; ======= import org.terasology.assets.ResourceUrn; import org.terasology.assets.management.AssetManager; import org.terasology.assets.module.ModuleAwareAssetT...
<<<<<<< ======= import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT; import static org.lwjgl.opengl.GL11.glClear; import static org.lwjgl.opengl.GL11.glLoadIdentity; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import jav...
<<<<<<< final UIImageOverlay overlay; final UIList list; final UIButton goToBack; final UIButton createNewWorld; final UIButton loadFromList; final UIButton deleteFromList; final UIDialogCreateNewWorld window; ======= final UIImageOverlay _overlay; final UIList _list; final UIB...
<<<<<<< import com.google.common.collect.SetMultimap; ======= import org.slf4j.Logger; import org.slf4j.LoggerFactory; >>>>>>> import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.SetMultimap; <<<<<<< private SetMultimap<AssetUri, URL> assets = HashMultimap.create(); pri...
<<<<<<< import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.IOException; import java.nio.ByteBuffer; import static org.lwjgl.opengl.GL11.GL_CULL_FACE; import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST; import static org.lwjgl.opengl.GL11.GL_LEQUAL; import static org.lwjgl.opengl.GL11.GL_N...
<<<<<<< /* * Copyright 2019 MovingBlocks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or ...
<<<<<<< getListView().setCacheColorHint(0xffffff); setListAdapter(listAdapter); // handler = new IncomingHandler(); ======= setListAdapter(bufferListAdapter); >>>>>>> getListView().setCacheColorHint(0xffffff); setListAdapter(listAdapter); // handler = new IncomingHandler(); setListAdapter(bufferL...
<<<<<<< import com.google.common.base.Supplier; ======= import java.util.Collections; import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.inject.Provider; >>>>>>> import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.inject.Provider; <<<<...
<<<<<<< import org.grouplens.lenskit.collections.LongSortedArraySet; import org.junit.Test; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; ======= import static org.grouplens.lenskit.util.test.ExtraMatchers.notANumber; import static org.hamcrest.CoreMatchers.*; import static org.j...
<<<<<<< List<ScoredId> out = accum.finish(); assertThat(out.size(), equalTo(3)); assertThat(out.get(0).getId(), equalTo(2L)); assertThat(out.get(0).getScore(), equalTo(9.8)); assertThat(out.get(1).getId(), equalTo(5L)); assertThat(out.get(1).getScore(), equalTo(4.2)); ...
<<<<<<< import org.grouplens.grapht.annotation.Transient; ======= import it.unimi.dsi.fastutil.longs.LongIterator; >>>>>>> <<<<<<< import org.grouplens.lenskit.data.dao.DataAccessObject; ======= import org.grouplens.lenskit.collections.LongSortedArraySet; import org.grouplens.lenskit.core.Transient; >>>>>>> impo...
<<<<<<< * Removes all channels from new {@code ScoredId} objects produced by the builder. * @return This builder (for chaining) ======= * Add a new typed side channel to the {@code ScoredId} under construction. * @param s The symbol for the side channel. * @param value The value for the side ...
<<<<<<< public GlobalMeanPredictor build() { double avg = computeMeanRating(context.getRatings().fastIterator()); ======= protected GlobalMeanPredictor buildNew(RatingBuildContext context) { double avg = computeMeanRating(context.ratingSnapshot().getRatings().fastIterator()); ...
<<<<<<< LongSet candidates = getCandidateSelector().selectItems(allItems, recommender, testUser); LongSet excludes = getExcludeSelector().selectItems(allItems, recommender, testUser); ResultList results = itemRecommender.recommendWithDetails(testUser.getUserId(), getListSize(), ...
<<<<<<< import org.grouplens.lenskit.data.pref.PreferenceDomain; ======= import java.io.Serializable; import javax.inject.Inject; import org.grouplens.lenskit.params.MaxRating; import org.grouplens.lenskit.params.MinRating; >>>>>>> import org.grouplens.lenskit.data.pref.PreferenceDomain; import javax.inject.Inject...
<<<<<<< public MetricResult measureUser(TestUser user, ResultList recs, Context context) { LongSet good = goodItems.selectItems(context.universe, context.recommender, user); ======= public MetricResult measureUser(TestUser user, int targetLength, ResultList recs, Context context) { LongSet goo...
<<<<<<< import java.util.BitSet; import java.util.Collection; import java.util.Map; import java.util.Set; ======= import java.util.*; import java.util.Map.Entry; >>>>>>> import java.util.BitSet; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import java.util.Set; <<<<<<< @Suppres...
<<<<<<< import org.grouplens.lenskit.util.TaskTimer; ======= import org.grouplens.lenskit.eval.metrics.predict.PredictEvalMetric.Accumulator; >>>>>>> <<<<<<< TaskTimer testTimer = new TaskTimer(); List<PredictEvalAccumulator> evalAccums = new ArrayList<PredictEvalAccumul...
<<<<<<< import org.grouplens.lenskit.eval.metrics.TestUserMetric; import org.grouplens.lenskit.util.tablewriter.*; ======= import org.grouplens.lenskit.eval.metrics.EvalMetric; import org.grouplens.lenskit.util.tablewriter.CSVWriter; import org.grouplens.lenskit.util.tablewriter.TableLayout; import org.grouplens.lens...
<<<<<<< List<TestUserMetric> evals, TTDataSet data) { ======= List<EvalMetric> evals, TTDataSet data, int numRecs) { >>>>>>> ...
<<<<<<< double globalMean = computeItemAverages(context.getRatings().fastIterator(), damping, itemMeans); ======= double globalMean = computeItemAverages(context.ratingSnapshot().getRatings().fastIterator(), smoothing, itemMeans); >>>>>>> double globalMean = computeItemAverages(co...
<<<<<<< import org.grouplens.lenskit.vectors.Vectors; ======= import org.grouplens.lenskit.vectors.VectorEntry; >>>>>>> import org.grouplens.lenskit.vectors.Vectors; import org.grouplens.lenskit.vectors.VectorEntry; <<<<<<< int nCoratings = 0; for (Vectors.EntryPair pair : Vectors.pairedFast(vec1, ...
<<<<<<< import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Random; ======= import com.google.common.base.Function; >>>>>>> import javax.annotation.Nonnull; import javax.annotation.Null...
<<<<<<< import org.grouplens.lenskit.util.LKFileUtils; import org.grouplens.lenskit.util.tablewriter.CSVWriter; import org.grouplens.lenskit.util.tablewriter.TableLayout; import org.grouplens.lenskit.util.tablewriter.TableLayoutBuilder; import org.grouplens.lenskit.util.tablewriter.TableWriter; import org.grouplens.len...
<<<<<<< import org.grouplens.lenskit.data.context.PackedRatingBuildContext; import org.grouplens.lenskit.data.context.PackedRatingSnapshot; import org.grouplens.lenskit.data.context.RatingBuildContext; ======= import org.grouplens.lenskit.data.context.PackedRatingBuildContext; import org.grouplens.lenskit.data.contex...
<<<<<<< import it.unimi.dsi.fastutil.longs.AbstractLongComparator; import it.unimi.dsi.fastutil.longs.Long2DoubleMap; import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongArrays; import it.unimi.dsi.fastutil.longs.LongComparator; import it.unimi.dsi.fastutil.longs.LongSortedSet; imp...
<<<<<<< ======= import org.grouplens.lenskit.data.context.RatingSnapshot; >>>>>>> <<<<<<< ======= /** * @param smoothing smoothing factor to use. 0 for no smoothing, 5 for Hofmann's implementation. * @param ratings used to calculate global variance for use in smoothing calculations. */ public UserVa...
<<<<<<< import org.grouplens.lenskit.norm.NormalizedRatingBuildContext; import org.grouplens.lenskit.norm.UserRatingVectorNormalizer; import org.grouplens.lenskit.util.FastCollection; ======= import org.grouplens.lenskit.data.dao.RatingDataSession; >>>>>>> <<<<<<< /** * Return the dao that is backing ...
<<<<<<< Long2ObjectMap<SparseVector> itemRatings = new Long2ObjectOpenHashMap<SparseVector>(itemData.size()); for (Long2ObjectMap.Entry<Long2DoubleMap> entry: CollectionUtils.fast(itemData.long2ObjectEntrySet())) { ======= Long2ObjectMap<ItemVector> itemRatings = ...
<<<<<<< import org.grouplens.lenskit.basic.TopNItemRecommender; ======= import org.grouplens.lenskit.core.LenskitConfiguration; >>>>>>> import org.grouplens.lenskit.basic.TopNItemRecommender; import org.grouplens.lenskit.core.LenskitConfiguration; <<<<<<< LenskitRecommenderEngineFactory factory = new Lenski...
<<<<<<< import org.cyclops.integrateddynamics.modcompat.charset.CharsetPipesModCompat; ======= import org.cyclops.integrateddynamics.modcompat.capabilities.WorkerCoalGeneratorTileCompat; import org.cyclops.integrateddynamics.modcompat.capabilities.WorkerDryingBasinTileCompat; import org.cyclops.integrateddynamics.mod...
<<<<<<< public <F extends IVariableFacade> ItemStack writeVariableFacadeItem(boolean generateId, ItemStack itemStack, IVariableFacadeHandler<F> variableFacadeHandler, IVariableFacadeFactory<F> variableFacadeFactory) { if(itemStack.isEmpty()) { return ItemStack.EMPTY; ======= public <F exte...
<<<<<<< ======= import org.cyclops.integrateddynamics.modcompat.ic2.Ic2ModCompat; import org.cyclops.integrateddynamics.modcompat.immersiveengineering.ImmersiveEngineeringModCompat; >>>>>>> <<<<<<< ======= modCompatLoader.addModCompat(new ImmersiveEngineeringModCompat()); modCompatLoader.addApiCo...
<<<<<<< /** * Abstract adapter for {@link org.askerov.dynamicgrid.DynamicGridView} with sable items id; */ public abstract class AbstractDynamicGridAdapter extends BaseAdapter implements DynamicGridAdapterInterface { public static final int INVALID_ID = -1; ======= private int nextStableId = 0; pr...
<<<<<<< ======= import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityPig; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; >>...
<<<<<<< ValueObjectTypeIngredients.ValueIngredients ingredients = variables.getValue(0); IRecipeHandler recipeHandler = (IRecipeHandler) this.getOperator().getRecipeHandler().orElse(null); ======= ValueObjectTypeIngredients.ValueIngredients ingredients = variables.getValue(0, Value...
<<<<<<< ======= import org.cyclops.integrateddynamics.modcompat.mcmultipart.McMultiPartModCompat; import org.cyclops.integrateddynamics.modcompat.minetweaker.MineTweakerModCompat; >>>>>>> <<<<<<< //modCompatLoader.addModCompat(new ImmersiveEngineeringModCompat()); ======= modCompatLoader.addModCom...
<<<<<<< // Doy_Q9012.run(); ======= // Doy_Q9012.run(); >>>>>>> // Doy_Q9012.run(); <<<<<<< Hee_Q1991.run(); ======= // Hee_Q10799.run(); // Hee_Q2004.run(); // Hee_Q2086.run(); // Hee_Q10974.run(); // Hee_Q1722.run(); // ...
<<<<<<< Hee_Q1717.run(); ======= // Doy_Q10799.run(); Hee_Q4195.run(); >>>>>>> Hee_Q1717.run(); Hee_Q4195.run();
<<<<<<< /* * Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source ======= /** * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source >>>>>>> /* * Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
<<<<<<< // Hee_Q1707.run(); Hee_Q2331.run(); ======= // Hee_Q11724.run(); // Hee_Q1707.run(); // Hee_Q1922.run(); // Hee_Q1707.run(); // Hee_Q11725.run(); // Hee_Q1167.run(); // Hee_Q1967.run(); // Hee_Q2805.run(); // Hee_Q2110.run(); // ...