Projects >> abolt >>f565f81d2c7ecd4ec89739d267141d1bf51c818a

Chunk
Conflicting content 
        Perception.Initialize();

<<<<<<< HEAD
=======
        if(opts.getBoolean("kinect")){
        	camera = new KinectCamera(simulator.getVisWorld()); // Lauren
        	kinectView = new KinectView();
            // XXX We'd like to remove this middleman to the arm
            //BoltArmCommandInterpreter interpreter = new BoltArmCommandInterpreter(getSegment(), opts.getBoolean("debug"));
        } else {
        	camera = new SimKinect(400, 300, simulator);
        }

        if (!opts.getBoolean("arm")) {
        	armSimulator = new ArmSimulator(simulator);
        }
>>>>>>> 9e478e3a9efaeed6808a63538202812b19303016

        // Initialize the JMenuBar
        createMenuBar();
Solution content 
        Perception.Initialize();

        // Initialize the JMenuBar
        createMenuBar();
File
Bolt.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
<<<<<<< HEAD
import abolt.kinect.*;
import abolt.util.*;
import abolt.bolt.Bolt;
import abolt.bolt.BoltObject;
import abolt.kinect.KUtils;
import abolt.kinect.ObjectInfo;
import april.jmat.LinAlg;
=======
>>>>>>> 9e478e3a9efaeed6808a63538202812b19303016
/**
 * @author Aaron
 * Contains methods for extracting size features from an object or point cloud
Solution content 
import abolt.kinect.*;
import abolt.util.*;

import abolt.bolt.Bolt;
import abolt.bolt.BoltObject;
import abolt.kinect.KUtils;
import abolt.kinect.ObjectInfo;
import april.jmat.LinAlg;
/**
 * @author Aaron
 * Contains methods for extracting size features from an object or point cloud
File
SizeFeatureExtractor.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import lcm.lcm.LCMDataInputStream;
import lcm.lcm.LCMSubscriber;

<<<<<<< HEAD
import abolt.lcmtypes.*;
import april.vis.*;
=======
import april.vis.*;

import abolt.bolt.*;
import abolt.classify.ColorFeatureExtractor;
import abolt.lcmtypes.*;
import abolt.objects.*;
import abolt.util.*;
>>>>>>> 9e478e3a9efaeed6808a63538202812b19303016

public class KinectCamera implements IBoltCamera, LCMSubscriber {
    final static int K_WIDTH = kinect_status_t.WIDTH;
Solution content 
import lcm.lcm.LCMDataInputStream;
import lcm.lcm.LCMSubscriber;

import abolt.lcmtypes.*;
import april.vis.*;
import abolt.util.*;
import abolt.classify.ColorFeatureExtractor;

public class KinectCamera implements IBoltCamera, LCMSubscriber {
    final static int K_WIDTH = kinect_status_t.WIDTH;
File
KinectCamera.java
Developer's decision
Combination
Kind of conflict
Import