conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private final String path;
private final SharedGroup sharedGroup;
=======
private SharedGroup sharedGroup;
>>>>>>>
private final String path;
private SharedGroup sharedGroup; |
<<<<<<<
import io.realm.internal.async.QueryUpdateTask;
import io.realm.internal.log.RealmLog;
=======
import io.realm.annotations.Required;
>>>>>>>
import io.realm.internal.async.QueryUpdateTask;
import io.realm.internal.log.RealmLog;
import io.realm.annotations.Required;
<<<<<<<
=======
private static final... |
<<<<<<<
import mods.railcraft.common.items.Metal;
import mods.railcraft.common.items.RailcraftItems;
import mods.railcraft.common.plugins.forge.WorldPlugin;
import net.minecraft.block.SoundType;
=======
import mods.railcraft.common.blocks.aesthetics.glass.BlockStrengthGlass;
import mods.railcraft.common.items.Metal;
... |
<<<<<<<
if (RailcraftConfig.printSignalDebug() && prevAspect != SignalAspect.BLINK_RED && controller.getAspect() == SignalAspect.BLINK_RED) {
Game.log(Level.INFO, "Signal Tile changed aspect to BLINK_RED: source:[{0}]", getPos());
=======
if (SignalTools.printSignalDebug && prevAspect != S... |
<<<<<<<
import mods.railcraft.common.blocks.machine.interfaces.ITileLit;
=======
import mods.railcraft.common.blocks.aesthetics.glass.BlockStrengthGlass;
import mods.railcraft.common.blocks.interfaces.ITileLit;
import mods.railcraft.common.gui.EnumGui;
>>>>>>>
import mods.railcraft.common.blocks.aesthetics.glass.Blo... |
<<<<<<<
import mods.railcraft.common.blocks.charge.IChargeBlock;
import mods.railcraft.common.items.ItemCharge;
=======
import mods.railcraft.api.charge.ConnectType;
import mods.railcraft.api.charge.IChargeBlock;
>>>>>>>
import mods.railcraft.api.charge.ConnectType;
import mods.railcraft.api.charge.IChargeBlock;
imp... |
<<<<<<<
import buildcraft.api.gates.IAction;
=======
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.statements.IActionExternal;
>>>>>>>
import buildcraft.api.statements.IActionExternal;
<<<<<<<
p... |
<<<<<<<
GameRegistry.registerTileEntity(TileAdminFeeder.class, "RCAdminFeederTile");
=======
GameRegistry.registerTileEntity(TileAdminSteamProducer.class, "RCAdminSteamProducerTile");
>>>>>>>
GameRegistry.registerTileEntity(TileAdminFeeder.class, "RCAdminFeederTile");
GameRegistry.reg... |
<<<<<<<
public abstract class BlockContainerRailcraftSubtyped<V extends Enum<V> & IVariantEnumBlock<V>> extends BlockContainerRailcraft implements ISubtypedBlock<V> {
private Class<V> variantClass;
private V[] variantValues;
private PropertyEnum<V> variantProperty;
=======
public abstract class BlockConta... |
<<<<<<<
buttonList.add(stateMode = GuiMultiButton.create(4, w + 53, h + 65, 70, tile.getStateModeController().copy()));
=======
buttonList.add(stateMode = new GuiMultiButton(4, w + 23, h + 65, 130, tile.getStateModeController().copy()));
>>>>>>>
buttonList.add(stateMode = GuiMultiButton.creat... |
<<<<<<<
import mods.railcraft.common.items.Metal;
import mods.railcraft.common.items.RailcraftItems;
import mods.railcraft.common.plugins.forge.WorldPlugin;
import net.minecraft.block.SoundType;
=======
import mods.railcraft.common.blocks.aesthetics.glass.BlockStrengthGlass;
import mods.railcraft.common.items.Metal;
... |
<<<<<<<
import java.util.List;
import org.junit.Test;
import org.junit.experimental.categories.Category;
=======
import java.util.Optional;
import org.junit.jupiter.api.Test;
>>>>>>>
import java.util.List;
import java.util.Optional;
import org.junit.jupiter.api.Test; |
<<<<<<<
private Class<V> variantClass;
private V[] variantValues;
private PropertyEnum<V> variantProperty;
=======
private VariantData<V> variantData;
>>>>>>>
private VariantData<V> variantData;
<<<<<<<
}
private void setup() {
if (variantProperty == null) {
Railcraf... |
<<<<<<<
import mods.railcraft.api.core.IPostConnection;
import mods.railcraft.api.core.IVariantEnum;
import mods.railcraft.common.blocks.BlockEntityDelegate;
import mods.railcraft.common.blocks.ISubtypedBlock;
import mods.railcraft.common.blocks.TileManager;
import mods.railcraft.common.blocks.machine.interfaces.ITileR... |
<<<<<<<
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import java.nio.file.ProviderNotFoundException;
=======
>>>>>>>
import org.springframework.beans.factory.annotation.Qualifier; |
<<<<<<<
import mods.railcraft.common.items.RailcraftItems;
import mods.railcraft.common.items.RailcraftToolItems;
=======
>>>>>>>
import mods.railcraft.common.items.RailcraftItems;
import mods.railcraft.common.items.RailcraftToolItems;
<<<<<<<
@Override
public void preInit() {
... |
<<<<<<<
final Data data = new Data();
data.setName(resolvedAttribute(dataNode, ATTRITBUTE.NAME));
data.setSourceLocation((Location) dataNode.getUserData(Location.USER_DATA_ID));
=======
final String source = resolvedAttribute(dataNode, AttributeName.SOURCE);
data = new Data();
data.setName(resolvedAttribu... |
<<<<<<<
throw new RuntimeException("query statement as column not supported!");
MySQLItemVisitor ev = new MySQLItemVisitor(currentDb, this.charsetIndex);
=======
throw new RuntimeException("query statement as column is not supported!");
MySQLItemVisitor ev = new MySQLItemVisitor(currentDb);
>>>>>>>
... |
<<<<<<<
private BackendConnection takeCon(BackendConnection conn,
final ResponseHandler handler, final Object attachment,
String schema) {
takeCon(conn,schema);
=======
private BackendConnection takeCon(BackendConnection conn, final ResponseHandler handler, final Object attachment,
String schem... |
<<<<<<<
if (SystemVariables.getSysVars().getDefaultValue(key) == null) {
=======
if (key.startsWith("@@")) {
key = key.substring(2);
}
if (SystemVariables.getDefaultValue(key) == null) {
>>>>>>>
if (key.startsWith("@@... |
<<<<<<<
=======
import com.vmware.flowgate.common.model.WormholePrivilege;
>>>>>>>
import com.vmware.flowgate.common.model.WormholePrivilege;
<<<<<<<
=======
>>>>>>>
<<<<<<<
@RequestMapping(value = "/privileges", method = RequestMethod.GET)
public Set<String> getPrivilegeName(HttpServletRequest requ... |
<<<<<<<
LightningDialogBuilder bookmarksDialogBuilder;
@Inject
PreferenceManager preferenceManager;
=======
BookmarksDialogBuilder mBookmarksDialogBuilder;
>>>>>>>
LightningDialogBuilder mBookmarksDialogBuilder;
@Inject
PreferenceManager mPreferenceManager;
<<<<<<<
even... |
<<<<<<<
KStream<byte[], String> stream1 = builder.stream(inputTopicA);
KStream<byte[], String> stream2 = stream1.mapValues((v -> v.toUpperCase()));
KStream<byte[], String> stream3 = stream1.mapValues(v -> v.toLowerCase());
=======
final KStream<byte[], String> stream1 = builder.stream(inputTopicA);
... |
<<<<<<<
new KeyValue<>("car-advertisement", "shown/not-clicked-yet"),
new KeyValue<>("newspaper-advertisement", "shown/not-clicked-yet"),
new KeyValue<>("gadget-advertisement", "shown/not-clicked-yet"),
new KeyValue<>("newspaper-advertisement", "shown/clicked"),
new KeyValue<>("gadget-adve... |
<<<<<<<
rest.start(CLUSTER.bootstrapServers(), TestUtils.tempDirectory().getPath());
Paths paths = new Paths("localhost", rest.port());
=======
rest.start(CLUSTER.bootstrapServers());
final Paths paths = new Paths("localhost", rest.port());
>>>>>>>
rest.start(CLUSTER.bootstrapServers(), TestUtils... |
<<<<<<<
private final ListBranchesPort listBranchesPort;
=======
private final TaskExecutor taskExecutor;
>>>>>>>
private final ListBranchesPort listBranchesPort;
private final TaskExecutor taskExecutor;
<<<<<<<
UpdateProjectPort updateProjectPort,
ListBranchesPort listBranchesPort) {
=======
... |
<<<<<<<
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getModulePath() {
return modulePath;
}
public void setModulePath(String modulePath) {
this.modulePath = modulePath;
}
=======
>>>>>>> |
<<<<<<<
client.target(path.urlPost()).request(APPLICATION_JSON_TYPE).post(Entity.json(inputOrder));
final Invocation.Builder builder = client
=======
postWithRetries(client.target(path.urlPost()).request(APPLICATION_JSON_TYPE), Entity.json(inputOrder), 5);
Invocation.Builder builder = client
>>>>>>>
... |
<<<<<<<
private StreamsBuilder createOrdersMaterializedView() {
StreamsBuilder builder = new StreamsBuilder();
builder.table(ORDERS.name(), Consumed.with(ORDERS.keySerde(), ORDERS.valueSerde()), Materialized.as(ORDERS_STORE_NAME))
=======
private Topology createOrdersMaterializedView() {
final Streams... |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
=======
final KStreamBuilder builder = new KStreamBuilder();
>>>>>>>
final StreamsBuilder builder = new StreamsBuilder();
<<<<<<<
// The number of segments has no impact on "correctness".
// Using more segments implies larger overhead but al... |
<<<<<<<
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
import org.apache.kafka.streams.state.ValueAndTimestamp;
=======
>>>>>>>
import org.apache.kafka.streams.state.ValueAndTimestamp;
<<<<<<<
private KeyValueStore<String, Pair<Double, Instant>> streamBuffe... |
<<<<<<<
private Topology createOrdersMaterializedView() {
StreamsBuilder builder = new StreamsBuilder();
builder.table(ORDERS.name(),
Consumed.with(ORDERS.keySerde(), ORDERS.valueSerde()),
Materialized.as(ORDERS_STORE_NAME))
=======
private KStreamBuilder createOrdersMaterializedView() {
... |
<<<<<<<
@ClassRule
public static final EmbeddedSingleNodeKafkaCluster CLUSTER = new EmbeddedSingleNodeKafkaCluster();
private static final String inputTopic = "inputTopic";
@BeforeClass
public static void startKafkaCluster() {
CLUSTER.createTopic(inputTopic);
}
=======
>>>>>>> |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
=======
final KStreamBuilder builder = new KStreamBuilder();
>>>>>>>
final StreamsBuilder builder = new StreamsBuilder();
<<<<<<<
String maxWindowStore = "max-window-store";
input.groupByKey()
.windowedBy(TimeWindows.of(TimeUnit.MINU... |
<<<<<<<
import org.apache.kafka.streams.StreamsBuilder;
=======
import org.apache.kafka.streams.KafkaStreams.State;
>>>>>>>
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.KafkaStreams.State; |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
=======
final KStreamBuilder builder = new KStreamBuilder();
>>>>>>>
final StreamsBuilder builder = new StreamsBuilder();
<<<<<<<
StoreBuilder<KeyValueStore<String, Long>> wordCountsStore = Stores.keyValueStoreBuilder(
Stores.persist... |
<<<<<<<
import org.apache.kafka.streams.kstream.Consumed;
=======
import org.apache.kafka.streams.Topology;
>>>>>>>
import org.apache.kafka.streams.kstream.Consumed;
import org.apache.kafka.streams.Topology; |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
=======
final KStreamBuilder builder = new KStreamBuilder();
>>>>>>>
final StreamsBuilder builder = new StreamsBuilder();
<<<<<<<
KafkaStreams streams = new KafkaStreams(builder.build(), streamsConfiguration);
=======
final KafkaStreams st... |
<<<<<<<
import org.apache.kafka.clients.consumer.ConsumerConfig;
=======
import io.confluent.examples.streams.microservices.util.MicroserviceTestUtils;
>>>>>>>
import io.confluent.examples.streams.microservices.util.MicroserviceTestUtils;
import org.apache.kafka.clients.consumer.ConsumerConfig;
<<<<<<<
private st... |
<<<<<<<
public void start(final String bootstrapServers, final String stateDir) {
streams = processStreams(bootstrapServers, stateDir);
=======
public void start(final String bootstrapServers) {
streams = processStreams(bootstrapServers, "/tmp/kafka-streams");
>>>>>>>
public void start(final String boo... |
<<<<<<<
List<Integer> inputValues = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
List<Integer> expectedValues = Collections.singletonList(30);
=======
final List<Integer> inputValues = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
final List<Integer> expectedValues = Arrays.asList(30);
>>>>>>>
f... |
<<<<<<<
import io.confluent.examples.streams.ExampleTestUtils;
=======
import io.confluent.examples.streams.microservices.util.MicroserviceTestUtils;
>>>>>>>
import io.confluent.examples.streams.ExampleTestUtils;
import io.confluent.examples.streams.microservices.util.MicroserviceTestUtils;
<<<<<<<
songsS... |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
KStream<String, OrderValidation> validations = builder
.stream(ORDER_VALIDATIONS.name(), serdes1);
KStream<String, Order> orders = builder
.stream(ORDERS.name(), serdes2)
=======
final KStreamBuilder builder = new KStreamBuilder();... |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
=======
final KStreamBuilder builder = new KStreamBuilder();
>>>>>>>
final StreamsBuilder builder = new StreamsBuilder();
<<<<<<<
KafkaStreams streams = new KafkaStreams(builder.build(), streamsConfiguration);
=======
final KafkaStreams st... |
<<<<<<<
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.ByteArraySerializer;
=======
>>>>>>> |
<<<<<<<
import org.apache.kafka.streams.StreamsBuilder;
=======
import org.apache.kafka.streams.KafkaStreams.State;
>>>>>>>
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.KafkaStreams.State; |
<<<<<<<
import org.apache.kafka.streams.kstream.Consumed;
=======
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.kafka.streams.KafkaStreams.State;
>>>>>>>
import org.apache.kafka.streams.kstream.Consumed;
import java.util.concurrent.CountDownLatch;
import java.uti... |
<<<<<<<
Properties schemaRegistryProps = new Properties();
=======
schemaRegistry = new RestApp(0, zookeeperConnect(), KAFKA_SCHEMAS_TOPIC, AVRO_COMPATIBILITY_TYPE);
// note: this following only goes to 3.3.x branches---don't merge into 4.x branches;
// 4.x branches have a different fix to make SR ac... |
<<<<<<<
StreamsBuilder builder = new StreamsBuilder();
KStream<String, String> alerts = builder.stream(adImpressionsTopic);
KStream<String, String> incidents = builder.stream(adClicksTopic);
=======
final KStreamBuilder builder = new KStreamBuilder();
final KStream<String, String> alerts = builder... |
<<<<<<<
public void start(final String bootstrapServers, final String stateDir) {
streams = processStreams(bootstrapServers, stateDir);
=======
public void start(final String bootstrapServers) {
streams = processStreams(bootstrapServers, "/tmp/kafka-streams");
>>>>>>>
public void start(final String boo... |
<<<<<<<
=======
import static org.mockito.Mockito.*;
import io.reflectoring.coderadar.CoderadarConfigurationProperties;
>>>>>>>
import static org.mockito.Mockito.*;
import io.reflectoring.coderadar.CoderadarConfigurationProperties; |
<<<<<<<
* $ java -cp target/kafka-streams-examples-5.0.0-SNAPSHOT-standalone.jar \
* io.confluent.examples.streams.interactivequeries.InteractiveQueriesExample 7070
=======
* $ java -cp target/kafka-streams-examples-4.0.0-SNAPSHOT-standalone.jar \
* io.confluent.examples.streams.interactivequeries.WordC... |
<<<<<<<
import io.confluent.examples.streams.kafka.EmbeddedSingleNodeKafkaCluster;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.ByteArrayS... |
<<<<<<<
import org.springframework.stereotype.Service;
=======
>>>>>>>
import org.springframework.stereotype.Service;
<<<<<<<
public List<MetricValueForCommit> get(GetMetricsForCommitCommand command, Long projectId) {
CommitEntity commitEntity =
getCommitsInProjectRepository.findByNameAndProjectId(com... |
<<<<<<<
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.ResponseBody;
=======
>>>>>>>
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.ResponseBody; |
<<<<<<<
import org.msgpack.template.TemplateBuilder;
import org.msgpack.template.TemplateClassWriter;
=======
>>>>>>>
import org.msgpack.template.TemplateClassWriter; |
<<<<<<<
case "kinesis": {
log.info("Adding Kinesis Logger with properties: " + elProps);
try {
loggers.add(new KinesisLogger(elProps));
} catch (Exception ex) {
log.error("... |
<<<<<<<
=======
import java.io.IOException;
>>>>>>>
import java.io.IOException; |
<<<<<<<
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
=======
import org.apache.http.client.methods.*;
>>>>>>>
impor... |
<<<<<<<
private String uploadFile = DescriptorImpl.uploadFile;
private String multipartName = DescriptorImpl.multipartName;
=======
private Boolean useSystemProperties = DescriptorImpl.useSystemProperties;
>>>>>>>
private String uploadFile = Descript... |
<<<<<<<
private final FilePath uploadFile;
private final String multipartName;
=======
private final boolean useSystemProperties;
>>>>>>>
private final FilePath uploadFile;
private final String multipartName;
private final boolean useSystemProperties;
<<<<<<<
http.getAuthentication(), uploadFile, http.... |
<<<<<<<
=======
setTypeface(TypefaceCache.getTypeface(context, TypefaceCache.TYPEFACE_NAME_ROBOTO_REGULAR));
setLinkTokenizer();
>>>>>>>
setLinkTokenizer();
<<<<<<<
=======
setTypeface(TypefaceCache.getTypeface(context, TypefaceCache.TYPEFACE_NAME_ROBOTO_REGULAR));
setLinkT... |
<<<<<<<
import androidx.fragment.app.Fragment;
=======
import androidx.appcompat.widget.SearchView;
>>>>>>>
import androidx.appcompat.widget.SearchView;
import androidx.fragment.app.Fragment;
<<<<<<<
public class TagsListFragment extends Fragment implements Bucket.Listener<Tag> {
=======
import static com.automat... |
<<<<<<<
import com.actionbarsherlock.view.MenuItem;
import com.automattic.simplenote.models.Note;
import com.simperium.client.Bucket;
=======
import com.simperium.client.*;
import com.automattic.simplenote.models.*;
import com.actionbarsherlock.view.MenuItem;
>>>>>>>
import com.actionbarsherlock.view.MenuItem;
impo... |
<<<<<<<
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
EasyTracker.getInstance().activityStart(this);
mTracker = EasyTracker.getTracker();
=======
mTracker = currentApp.getTracker();
>>>>>>>
Toolbar toolbar = (Toolbar) findViewBy... |
<<<<<<<
import android.support.design.widget.Snackbar;
=======
import android.support.v4.app.Fragment;
>>>>>>>
import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
<<<<<<<
=======
import com.commonsware.cwac.anddown.AndDown;
import com.kennyc.bottomsheet.BottomSheet;
import com.k... |
<<<<<<<
=======
import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.ImageButton;
>>>>>>>
import android.widget.FrameLayout;
<<<<<<<
=======
import com.automattic.simplenote.utils.PrefUtils;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.go... |
<<<<<<<
import android.support.annotation.NonNull;
=======
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.ActivityOptionsCompat;
>>>>>>>
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.supp... |
<<<<<<<
public class Simplenote extends Application {
public static final String DELETED_NOTE_ID = "deletedNoteId";
public static final String SELECTED_NOTE_ID = "selectedNoteId";
public static final String TAG = "Simplenote";
public static final int INTENT_EDIT_NOTE = 2;
public static final int INT... |
<<<<<<<
public void think(ChipState chip) {
chip.title("RECIEVER");
String id = chip.text().getLine3();
if (!id.isEmpty()) {
Boolean out = MC1110.airwaves.get(id);
if (out == null) {
chip.out(1).set(false);
} else {
chip.out... |
<<<<<<<
=======
private String[] generateICText(Player p) {
ArrayList<String> icNameList = new ArrayList<String>();
icNameList.addAll(icList.keySet());
Collections.sort(icNameList);
ArrayList<String> strings = new ArrayList<String>();
for(String ic:i... |
<<<<<<<
public final static String METHODSTRING_RECONNECTWIFIAP = "ReconnectWifiAP";
public final static String METHODSTRING_ISBLESUPPORTED = "IsBLESupported";
=======
public final static String METHODSTRING_ISBLESUPPORTED = "IsBLESupported";
>>>>>>>
public final static String METHODSTRING_REC... |
<<<<<<<
import org.junit.runner.notification.Failure;
import org.thaliproject.p2p.btconnectorlib.PeerProperties;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
=======
import org.thaliproject.p2p.btconnectorlib.PeerProperties;
>>>>>>>
import org.junit.runner.notification.Failur... |
<<<<<<<
import android.util.Log;
import com.test.thalitest.ThaliTestRunner;
=======
import android.bluetooth.BluetoothSocket;
import android.system.ErrnoException;
import android.system.OsConstants;
import android.util.Log;
import com.test.thalitest.ThaliTestRunner;
>>>>>>>
import android.bluetooth.BluetoothSock... |
<<<<<<<
import org.geowebcache.config.BlobStoreInfo;
=======
import org.geowebcache.config.BlobStoreConfig;
import org.geowebcache.config.Info;
>>>>>>>
import org.geowebcache.config.BlobStoreInfo;
import org.geowebcache.config.Info; |
<<<<<<<
InvocationAssistance invocationAssistance = new InvocationAssistanceBuilder().withIsScriptSrc(true).withIsCompiledSrc(true).build();
CoverityPublisher publisher = new CoverityPublisherBuilder().withInvocationAssistance(invocationAssistance).build();
Command covBuildCommand = new CovBuil... |
<<<<<<<
private final String javaWarFile;
=======
private final String csharpMsvscaOutputFiles;
private final boolean csharpAutomaticAssemblies;
private final boolean csharpMsvsca;
>>>>>>>
private final String javaWarFile;
private final String csharpMsvscaOutputFiles;
private final boolean csharpAutomaticAs... |
<<<<<<<
import com.google.openrtb.OpenRtb.BidRequest.Geo.Builder;
import com.google.openrtb.OpenRtbNative;
=======
>>>>>>>
import com.google.openrtb.OpenRtbNative; |
<<<<<<<
Map<ResourceGroup, List<RequestMappingContext>> resourceGroupRequestMappings
= new HashMap<>();
=======
ArrayListMultimap<ResourceGroup, RequestMappingContext> resourceGroupRequestMappings
= ArrayListMultimap.create();
int requestMappingContextId = 0;
>>>>>>>
Map<ResourceGro... |
<<<<<<<
public Optional<PersistentEntity<?, ?>> entity() {
return entities.getPersistentEntity(resource.getDomainType());
=======
public PersistentEntity<?, ? extends PersistentProperty<?>> entity() {
Object domainType = resource.getDomainType();
OptionalDeferencer<Class<?>> converter = new OptionalDe... |
<<<<<<<
import com.google.common.collect.Ordering;
import com.google.common.primitives.Ints;
=======
>>>>>>> |
<<<<<<<
=======
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
>>>>>>>
<<<<<<<
this.allowableValues = ofNullable(allowableValues);
this.itemModel = ofNullable(itemModel);
=======
this.allowableValues = Optional.fromNullable(allow... |
<<<<<<<
try{
misraConfigFile.createNewFile();
InvocationAssistance invocationAssistance = new InvocationAssistance(
false, StringUtils.EMPTY, false, StringUtils.EMPTY, false, false,
StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, StringUt... |
<<<<<<<
=======
import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.rest.core.mapping.ResourceMapping;
import org.springframework.data.rest.core.mapping.ResourceMetadata;
import org.springframework.web.bind.annotation.RequestMethod;
>>>>>>>
<<<<<<<
final List<Req... |
<<<<<<<
=======
import com.fasterxml.classmate.ResolvedType;
import com.fasterxml.classmate.TypeResolver;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.repository.query.Param;
import org.springframework.data.rest.core.mapping.MethodResourceMapping;
import org.springframewor... |
<<<<<<<
=======
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
>>>>>>>
<<<<<<<
final List<RequestHandler> handlers = new ArrayList<>();
=======
final List<RequestHandler> handlers = new ArrayList<>();
final PersistentEntity<?, ?>... |
<<<<<<<
import java.util.Collections;
=======
import java.util.Collection;
import java.util.LinkedHashMap;
>>>>>>>
import java.util.Collection;
<<<<<<<
Multimap<String, ApiListing> apiListingMap = LinkedListMultimap.create();
Map<ResourceGroup, Map<String, Model>> models = apiModelReader.read(context);
==... |
<<<<<<<
import org.reflections.Reflections;
=======
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
>>>>>>>
import io.github.lukehutch.fastclasspathscanner.FastClasspathScann... |
<<<<<<<
import java.util.Optional;
import java.util.function.Function;
=======
import java.util.Map;
>>>>>>>
import java.util.Map;
import java.util.Optional;
import java.util.function.Function; |
<<<<<<<
import java.io.*;
import java.util.Arrays;
import java.util.HashMap;
=======
import java.util.*;
>>>>>>>
import java.io.*;
import java.util.*; |
<<<<<<<
_dinfo = new DataInfo(fr, 1, use_all_factor_levels || lambda_search, standardize,false);
_activeData = _dinfo;
=======
_dinfo = new DataInfo(fr, 1, use_all_factor_levels || lambda_search, standardize ? DataInfo.TransformType.STANDARDIZE : DataInfo.TransformType.NONE, DataInfo.TransformType.NONE);
... |
<<<<<<<
if(effectiveIA.getIsUsingMisra() && (this.version.compareMajor(7) == 0)){
cmd.add("--misra-only");
} else if(effectiveIA.getCommitArguments() != null) {
cmd.addAll(EnvParser.tokenize(effectiveIA.getCommitArgu... |
<<<<<<<
FVecTest.makeByteVec(raw, "x,y\n0,0\n1,0.1\n2,0.2\n3,0.3\n4,0.4\n5,0.5\n6,0.6\n7,0.7\n8,0.8\n9,0.9");
Frame fr = ParseDataset2.parse(parsed, new Key[]{raw});
new GLM2("GLM test of gaussian(linear) regression.",model,fr,false,Family.gaussian, Family.gaussian.defaultLink,0,0).fork().get();
GLM... |
<<<<<<<
public final void compute2() {
=======
@Override
public final void compute() {
>>>>>>>
@Override
public final void compute2() { |
<<<<<<<
=======
lambda = i == lambda.length?new double [] {lambda_max}:Arrays.copyOfRange(lambda, i, lambda.length);
}
_model = new GLMModel(GLM2.this, self(),dest(),_dinfo, _glm,beta_epsilon,alpha[0],lambda_max,lambda,ymut.ymu());
_model.warnings = warns;
... |
<<<<<<<
C1Chunk( byte[] bs ) { super(0xFF); _mem=bs; _start = -1; _len = _mem.length; }
@Override public long at8_impl( int i ) { return 0xFF&_mem[i+OFF]; }
@Override public double atd_impl( int i ) {
int res = 0xFF&_mem[i+OFF];
return (res == NA())?Double.NaN:res;
=======
static protected fin... |
<<<<<<<
@Test
public void doFillToolInstallationNameItems_returnsInstallations() {
PowerMockito.mockStatic(SaveableListener.class);
final DescriptorImpl descriptor = new CoverityPublisher.DescriptorImpl();
ListBoxModel installationNameItems = descriptor.doFillToolInstallationNameItems(... |
<<<<<<<
Request.addToNavbar(registerRequest(new KMeans2()), "KMeans2" ,"Beta (FluidVecs!)");
=======
Request.addToNavbar(registerRequest(new Inspect2()), "Inspect", "Beta (FluidVecs!)");
>>>>>>>
Request.addToNavbar(registerRequest(new Inspect2()), "Inspect", "Beta (FluidVecs!)");... |
<<<<<<<
public GBMModel(DTree.TreeModel prior, double err, ConfusionMatrix cm, ConfusionMatrix[] auccms) {
super(prior, err, cm, null, null, auccms);
=======
public GBMModel(DTree.TreeModel prior, double err, ConfusionMatrix cm, water.api.AUC validAUC) {
super(prior, err, cm, validAUC);
>>>>>>>
... |
<<<<<<<
@Override protected Status exec() {
=======
@Override protected void logStart() {
Log.info("Starting GBM model build...");
super.logStart();
Log.info(" learn_rate: " + learn_rate);
}
@Override protected JobState exec() {
>>>>>>>
@Override protected JobState exec() { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.