Commit 0321a48a authored by IT17165662's avatar IT17165662

Modified Probability calculation functions

parent 89e6b31f
......@@ -59,6 +59,13 @@ public class AintersectionBDependantEvent extends Fragment {
Double ProbabilityOFAandB = bundle.getDouble("ProbabilityAandB_value");
if(ProbabilityOFAorB < ProbabilityOFA || ProbabilityOFAorB < ProbabilityOFB ) {
mfinalanswer.setText("P(A or B) must be greater or equal to P(A) or P(B)");
mresult.setText("P(A or B) must be greater or equal to P(A) or P(B)");
}
mPB.setText(ProbabilityOFB.toString());
mPA.setText(ProbabilityOFAandB.toString());
......@@ -73,7 +80,8 @@ public class AintersectionBDependantEvent extends Fragment {
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -66,6 +66,18 @@ public class DepandantProbablityA_BFragment extends Fragment {
mPB2.setText(ProbabilityOFB.toString());
if(ProbabilityOFB < ProbabilityOFAandB ) {
mfinalanswer.setText(" P(B) must be greater or equal to P(A and B)");
mresult.setText(" P(B) must be greater or equal to P(A and B)");
}
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -69,11 +69,16 @@ public class DependantAunionB extends Fragment {
mPAandB2.setText(ProbabilityOFAandB.toString());
mPA2.setText(ProbabilityOFAorB.toString());
if(ProbabilityOFA < ProbabilityOFAandB || ProbabilityOFB < ProbabilityOFAandB ) {
mfinalanswer.setText(" P(A) or P(B) must be greater or equal to P(A and B)");
mresult.setText("P(A) or P(B) must be greater or equal to P(A and B)");
}
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -67,6 +67,19 @@ public class DependantProbablityB_AFragment extends Fragment {
if(ProbabilityOFB < ProbabilityOFAandB ) {
mfinalanswer.setText(" P(A) must be greater or equal to P(A and B)");
mresult.setText(" P(A) must be greater or equal to P(A and B)");
}
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -58,9 +58,16 @@ public class ProbabilityOfAForDependantEventFragment extends Fragment {
Double ProbabilityOFAorB = bundle.getDouble("ProbabilityAorB_value");
Double ProbabilityOFAandB = bundle.getDouble("ProbabilityAandB_value");
if(ProbabilityOFAorB < ProbabilityOFB || ProbabilityOFAandB > ProbabilityOFB ) {
mfinalanswer.setText("P(A or B) must be greater or equal to P(B)");
mresult.setText("P(A or B) must be greater or equal to P(B)");
}
mPB.setText(ProbabilityOFB.toString());
mPB.setText(ProbabilityOFB.toString());
mPAandB.setText(ProbabilityOFAandB.toString());
mPAorB.setText(ProbabilityOFAorB.toString());
mfinalanswer.setText(ProbabilityOFA.toString());
......@@ -73,6 +80,8 @@ public class ProbabilityOfAForDependantEventFragment extends Fragment {
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -56,7 +56,11 @@ public class ProbabilityOfAIndependantEvent extends Fragment {
Double ProbabilityOFAandB = bundle.getDouble("ProbabilityAandB_value");
if( ProbabilityOFAandB > ProbabilityOFA ) {
mfinalanswer.setText(" P(A) must be greater or equal to P(A and B)");
mresult.setText("P(A) must be greater or equal to P(A and B)");
}
mPB.setText(ProbabilityOFB.toString());
mPAandB.setText(ProbabilityOFAandB.toString());
mfinalanswer.setText(ProbabilityOFA.toString());
......@@ -64,6 +68,8 @@ public class ProbabilityOfAIndependantEvent extends Fragment {
mPB2.setText(ProbabilityOFB.toString());
mPAandB2.setText(ProbabilityOFAandB.toString());
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -60,6 +60,14 @@ public class ProbabilityOfBForDependantEventFragment extends Fragment {
if(ProbabilityOFAorB < ProbabilityOFA || ProbabilityOFAandB > ProbabilityOFA ) {
mfinalanswer.setText("P(A or B) must be greater or equal to P(A)");
mresult.setText("P(A or B) must be greater or equal to P(A)");
}
mPB.setText(ProbabilityOFB.toString());
mPAandB.setText(ProbabilityOFAandB.toString());
mPAorB.setText(ProbabilityOFAorB.toString());
......@@ -69,6 +77,10 @@ public class ProbabilityOfBForDependantEventFragment extends Fragment {
mPAandB2.setText(ProbabilityOFAandB.toString());
mPAorB2.setText(ProbabilityOFAorB.toString());
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -56,7 +56,11 @@ public class ProbabilityOfBIndependantEvent extends Fragment {
Double ProbabilityOFAandB = bundle.getDouble("ProbabilityAandB_value");
if( ProbabilityOFAandB > ProbabilityOFB ) {
mfinalanswer.setText(" P(B) must be greater or equal to P(A and B)");
mresult.setText("P(B) must be greater or equal to P(A and B)");
}
mPB.setText(ProbabilityOFB.toString());
mPAandB.setText(ProbabilityOFAandB.toString());
mfinalanswer.setText(ProbabilityOFA.toString());
......@@ -73,7 +77,8 @@ public class ProbabilityOfBIndependantEvent extends Fragment {
mfinalanswer.setMovementMethod(new ScrollingMovementMethod());
mresult.setMovementMethod(new ScrollingMovementMethod());
......
......@@ -336,7 +336,9 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"
/>
<TextView
android:id="@+id/textview_pbs"
......@@ -400,7 +402,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -277,7 +277,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -316,7 +317,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -337,7 +337,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -401,7 +402,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -277,7 +277,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -316,7 +317,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -354,7 +354,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......@@ -593,7 +594,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/paandbb"
style="@style/Base.TextAppearance.AppCompat.Large"
......
......@@ -278,7 +278,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -317,7 +318,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -336,7 +336,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -400,7 +401,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -278,7 +278,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -317,7 +318,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -335,7 +335,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -399,7 +400,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
......@@ -277,7 +277,8 @@
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_pbs"
......@@ -316,7 +317,8 @@
android:layout_marginBottom="288dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:scrollbars="vertical"/>
<TextView
android:id="@+id/textview_step3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment