Projects >> inceptusRobot-2012 >>dfdd2934aa04f53772bc7debfad7ccae4d07de68

Chunk
Conflicting content
    
<<<<<<< HEAD
        int hoop = 4;
    public void prepareToShoot( double inches ){
=======
    public double inchesToRPMs(double distance){
        int angle = 57;
            
    }
        double wheelDiameter = 6;
        //Calculate height
        int height = 0;
        //Switch for hoop
        switch(hoop){
            case 1:
                height = 34;
                break;
            case 2:
            case 3:
                height = 60;
                break;
            case 4:
            default:
                height = 91;
                break;
        }
        //Add adjustment for air resistance.
        distance *= 1.05;
        //Change angle from degrees to radians
        double angleRads = angle * Math.PI/180;
        //Calculate velocity needed and chnage to RPM required
        double velocity = -193.044*distance*distance/(height-52-distance*Math.tan(angleRads));
        if(velocity < 0)
            return 0;
        else
            velocity = Math.sqrt(velocity)/Math.cos(angleRads);
        double RPM = velocity * 60 / (wheelDiameter * Math.PI);
        return RPM;
    }
    
    public void prepareToShoot( double inches){
>>>>>>> cafee97daace20f156de38f85e5436d503ec4b16
        
        //Prebuilt values
        final double maxPower = .5;
Solution content
        //Prebuilt values
        final double maxPower = .5;
            
    }
    
    public void prepareToShoot( double inches ){
        
File
UpperShooter.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature