Skip to content

2
20_21-J03
Commit 1fba68ab authored by IT17165662's avatar IT17165662
Browse files
Options

update interfaces

parent 5d4eea5c
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 112 deletions
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProbablilityCalculation.java
View file @ 1fba68ab
......@@ -27,15 +27,15 @@ import java.util.ArrayList;
public class ProbablilityCalculation extends AppCompatActivity {
Double ProbabilityvalueA=0.2;
Double ProbabilityvalueA=0.4;
Double ProbabilityvalueB=0.3;
Double ProbabilityvalueAandB=0.1;
Double ProbabilityvalueAandB=0.2;
Double ProbabilityvalueAorB=0.5;
Double ProbabilityvalueAB=0.1;
Double ProbabilityvalueBA=0.1;
Double ProbabilityvalueBA=0.2;
String des_calculation_type;
//String Probability_Type;
String Probability_Type;
@Override
......@@ -48,7 +48,7 @@ public class ProbablilityCalculation extends AppCompatActivity {
Bundle bundle = new Bundle();
//from extracted data get the values
Intent intent = getIntent();
Intent intent = getIntent();
/* ProbabilityvalueA = intent.getDoubleExtra("PA");
ProbabilityvalueB = intent.getDoubleExtra("PB");
ProbabilityvalueAandB = intent.getDoubleExtra("PAandB");
......@@ -76,36 +76,35 @@ public class ProbablilityCalculation extends AppCompatActivity {
ArrayList<Object> DeppsProbabilityofAandBlist = new ArrayList<Object>();
DepProbabilityofAlist = probabilityCalc.DepProbabilityA(ProbabilityvalueAorB, ProbabilityvalueB, ProbabilityvalueAandB);
DepProbabilityofBlist = probabilityCalc.DepProbabilityB(ProbabilityvalueAorB, ProbabilityvalueA, ProbabilityvalueAandB);
DepProbabilityofAlist = probabilityCalc.DepProbabilityA(ProbabilityvalueAorB,ProbabilityvalueB,ProbabilityvalueAandB);
DepProbabilityofBlist = probabilityCalc.DepProbabilityB(ProbabilityvalueAorB,ProbabilityvalueA,ProbabilityvalueAandB);
InDepProbabilityofAlist = probabilityCalc.IndependantProbabilityA(ProbabilityvalueAandB, ProbabilityvalueB);
InDepProbabilityofBlist = probabilityCalc.IndependantProbabilityB(ProbabilityvalueAandB, ProbabilityvalueA);
InDepProbabilityofAlist=probabilityCalc.IndependantProbabilityA(ProbabilityvalueAandB,ProbabilityvalueB);
InDepProbabilityofBlist=probabilityCalc.IndependantProbabilityB(ProbabilityvalueAandB,ProbabilityvalueA);
DepProbabilityofAandBlist = probabilityCalc.DepProA_Intersection_B(ProbabilityvalueA, ProbabilityvalueB, ProbabilityvalueAorB);
InDepProbabilityofAandBlist = probabilityCalc.InDepProAandB(ProbabilityvalueA, ProbabilityvalueB);
DepProbabilityofAandBlist=probabilityCalc.DepProA_Intersection_B(ProbabilityvalueA,ProbabilityvalueB,ProbabilityvalueAorB);
InDepProbabilityofAandBlist=probabilityCalc.InDepProAandB(ProbabilityvalueA,ProbabilityvalueB);
DeppProbabilityofAandBlist = probabilityCalc.Depp_ProbabilityAandB(ProbabilityvalueAB, ProbabilityvalueB);
DeppsProbabilityofAandBlist = probabilityCalc.Depps_ProbabilityAandB(ProbabilityvalueBA, ProbabilityvalueA);
DeppProbabilityofAandBlist=probabilityCalc.Depp_ProbabilityAandB(ProbabilityvalueAB,ProbabilityvalueB);
DeppsProbabilityofAandBlist=probabilityCalc.Depps_ProbabilityAandB(ProbabilityvalueBA,ProbabilityvalueA);
DepProbabilityofAorBlist = probabilityCalc.DepProA_Union_B(ProbabilityvalueA, ProbabilityvalueB, ProbabilityvalueAandB);
InDepProbabilityofAorBlist = probabilityCalc.Independant_A_Union_B(ProbabilityvalueA, ProbabilityvalueB);
DepProbabilityofAorBlist = probabilityCalc.DepProA_Union_B(ProbabilityvalueA,ProbabilityvalueB,ProbabilityvalueAandB);
InDepProbabilityofAorBlist=probabilityCalc.Independant_A_Union_B(ProbabilityvalueA,ProbabilityvalueB);
DepProbabilityofA_Blist = probabilityCalc.Dep_ProbabilityA_B(ProbabilityvalueAandB, ProbabilityvalueB);
DepProbabilityofB_Alist = probabilityCalc.Dep_ProbabilityB_A(ProbabilityvalueAandB, ProbabilityvalueA);
DepProbabilityofA_Blist=probabilityCalc.Dep_ProbabilityA_B(ProbabilityvalueAandB,ProbabilityvalueB);
DepProbabilityofB_Alist=probabilityCalc.Dep_ProbabilityB_A(ProbabilityvalueAandB,ProbabilityvalueA);
IndDepProbabilityofAUnionBType2list=probabilityCalc.Independant_A_Union_B_Type2(ProbabilityvalueAandB,ProbabilityvalueB);
IndDepProbabilityofAUnionBType3list=probabilityCalc.Independant_A_Union_B_Type3(ProbabilityvalueAandB,ProbabilityvalueA);
IndDepProbabilityofAUnionBType2list = probabilityCalc.Independant_A_Union_B_Type2(ProbabilityvalueAandB, ProbabilityvalueB);
IndDepProbabilityofAUnionBType3list = probabilityCalc.Independant_A_Union_B_Type3(ProbabilityvalueAandB, ProbabilityvalueA);
des_calculation_type = intent.getStringExtra("des_calculation_type");
//Probability_Type=intent.getStringExtra("des_calculation_type");
// Probability_Type = intent.getStringExtra("ProbabilityType");
//switch function
// if(Probability_Type.equals("Dependant")) {
/* switch (des_calculation_type) {
// if (Probability_Type.equals("Dependant")) {
switch (des_calculation_type) {
case "P(A)":
bundle.putDouble("ProbabilityB_value", (Double) DepProbabilityofAlist.get(1));
......@@ -120,7 +119,7 @@ public class ProbablilityCalculation extends AppCompatActivity {
fragmentTransaction.commit();
break;
case "P(A and B)":
if((ProbabilityvalueAB != null && ProbabilityvalueB != null) && (ProbabilityvalueA == null && ProbabilityvalueAorB == null && ProbabilityvalueAandB == null && ProbabilityvalueBA == null) ) {
if ((ProbabilityvalueAB != null && ProbabilityvalueB != null) && (ProbabilityvalueA == null && ProbabilityvalueAorB == null && ProbabilityvalueAandB == null && ProbabilityvalueBA == null)) {
bundle.putDouble("ProbabilityB_value", (Double) DeppProbabilityofAandBlist.get(0));
bundle.putDouble("ProbabilityAB_value", (Double) DeppProbabilityofAandBlist.get(1));
bundle.putDouble("ProbabilityAandB_value", (Double) DeppProbabilityofAandBlist.get(2));
......@@ -132,8 +131,7 @@ public class ProbablilityCalculation extends AppCompatActivity {
fragmentTransaction.commit();
break;
}
else if((ProbabilityvalueBA != null && ProbabilityvalueA != null) && (ProbabilityvalueB == null && ProbabilityvalueAorB == null && ProbabilityvalueAandB == null && ProbabilityvalueAB == null) ) {
} else if ((ProbabilityvalueBA != null && ProbabilityvalueA != null) && (ProbabilityvalueB == null && ProbabilityvalueAorB == null && ProbabilityvalueAandB == null && ProbabilityvalueAB == null)) {
bundle.putDouble("ProbabilityA_value", (Double) DeppsProbabilityofAandBlist.get(0));
bundle.putDouble("ProbabilityBA_value", (Double) DeppsProbabilityofAandBlist.get(1));
bundle.putDouble("ProbabilityAandB_value", (Double) DeppsProbabilityofAandBlist.get(2));
......@@ -145,19 +143,18 @@ public class ProbablilityCalculation extends AppCompatActivity {
fragmentTransaction.commit();
break;
}
else
} else
bundle.putDouble("ProbabilityB_value", (Double) DepProbabilityofAandBlist.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) DepProbabilityofAandBlist.get(2));
bundle.putDouble("ProbabilityAandB_value", (Double) DepProbabilityofAandBlist.get(3));
bundle.putDouble("ProbabilityA_value", (Double) DepProbabilityofAandBlist.get(0));
bundle.putDouble("ProbabilityAorB_value", (Double) DepProbabilityofAandBlist.get(2));
bundle.putDouble("ProbabilityAandB_value", (Double) DepProbabilityofAandBlist.get(3));
bundle.putDouble("ProbabilityA_value", (Double) DepProbabilityofAandBlist.get(0));
AintersectionBDependantEvent aintersectionBDependantEvent = new AintersectionBDependantEvent();
aintersectionBDependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, aintersectionBDependantEvent);
fragmentTransaction.commit();
break;
AintersectionBDependantEvent aintersectionBDependantEvent = new AintersectionBDependantEvent();
aintersectionBDependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, aintersectionBDependantEvent);
fragmentTransaction.commit();
break;
case "P(A or B)":
bundle.putDouble("ProbabilityB_value", (Double) DepProbabilityofAorBlist.get(1));
......@@ -210,92 +207,91 @@ public class ProbablilityCalculation extends AppCompatActivity {
fragmentTransaction.add(R.id.fragment_container, probabilityOfBForDependantEventFragment);
fragmentTransaction.commit();
break;
}}
//if (Probability_Type.equals("Independant")){*/
switch (des_calculation_type) {
case "P(A)":
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAlist.get(1));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAlist.get(2));
}
}
/*if (Probability_Type.equals("Independant")) {
switch (des_calculation_type) {
case "P(A)":
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAlist.get(1));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAlist.get(2));
ProbabilityOfAIndependantEvent probabilityOfAIndependantEvent = new ProbabilityOfAIndependantEvent();
probabilityOfAIndependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, probabilityOfAIndependantEvent);
fragmentTransaction.commit();
break;
ProbabilityOfAIndependantEvent probabilityOfAIndependantEvent = new ProbabilityOfAIndependantEvent();
probabilityOfAIndependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, probabilityOfAIndependantEvent);
fragmentTransaction.commit();
break;
case "P(A and B)":
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAandBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAandBlist.get(2));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAandBlist.get(1));
case "P(A and B)":
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAandBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAandBlist.get(2));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAandBlist.get(1));
IndependantAandB independantAandB = new IndependantAandB();
independantAandB.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, independantAandB);
fragmentTransaction.commit();
break;
IndependantAandB independantAandB = new IndependantAandB();
independantAandB.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, independantAandB);
fragmentTransaction.commit();
break;
case "P(A or B)":
if (ProbabilityvalueA == null ){
bundle.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType2list.get(0));
bundle.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType2list.get(3));
bundle.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType2list.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) IndDepProbabilityofAUnionBType2list.get(2));
case "P(A or B)":
if (ProbabilityvalueA == null) {
bundle.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType2list.get(0));
bundle.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType2list.get(3));
bundle.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType2list.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) IndDepProbabilityofAUnionBType2list.get(2));
TypeTwoA_Union_B_IndeFragment typeTwoA_union_b_indeFragment = new TypeTwoA_Union_B_IndeFragment();
typeTwoA_union_b_indeFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, typeTwoA_union_b_indeFragment);
fragmentTransaction.commit();
break;
}else if (ProbabilityvalueB == null){
bundle.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType3list.get(0));
bundle.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType3list.get(3));
bundle.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType3list.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) IndDepProbabilityofAUnionBType3list.get(2));
TypeTwoA_Union_B_IndeFragment typeTwoA_union_b_indeFragment = new TypeTwoA_Union_B_IndeFragment();
typeTwoA_union_b_indeFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, typeTwoA_union_b_indeFragment);
fragmentTransaction.commit();
break;
} else if (ProbabilityvalueB == null) {
bundle.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType3list.get(0));
bundle.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType3list.get(3));
bundle.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType3list.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) IndDepProbabilityofAUnionBType3list.get(2));
TypeThreeIndeAUnionBFragment typeThreeIndeAUnionBFragment = new TypeThreeIndeAUnionBFragment();
typeThreeIndeAUnionBFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, typeThreeIndeAUnionBFragment);
fragmentTransaction.commit();
break;
}
else
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAorBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAorBlist.get(3));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAorBlist.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) InDepProbabilityofAorBlist.get(2));
TypeThreeIndeAUnionBFragment typeThreeIndeAUnionBFragment = new TypeThreeIndeAUnionBFragment();
typeThreeIndeAUnionBFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, typeThreeIndeAUnionBFragment);
fragmentTransaction.commit();
break;
} else
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAorBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAorBlist.get(3));
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAorBlist.get(1));
bundle.putDouble("ProbabilityAorB_value", (Double) InDepProbabilityofAorBlist.get(2));
IndeAunionBFragment indeAunionBFragment = new IndeAunionBFragment();
indeAunionBFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, indeAunionBFragment);
fragmentTransaction.commit();
break;
IndeAunionBFragment indeAunionBFragment = new IndeAunionBFragment();
indeAunionBFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, indeAunionBFragment);
fragmentTransaction.commit();
break;
case "P(B)":
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofBlist.get(1));
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofBlist.get(2));
case "P(B)":
bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofBlist.get(0));
bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofBlist.get(1));
bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofBlist.get(2));
ProbabilityOfBIndependantEvent probabilityOfBIndependantEvent = new ProbabilityOfBIndependantEvent();
probabilityOfBIndependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, probabilityOfBIndependantEvent);
fragmentTransaction.commit();
break;
ProbabilityOfBIndependantEvent probabilityOfBIndependantEvent = new ProbabilityOfBIndependantEvent();
probabilityOfBIndependantEvent.setArguments(bundle);
fragmentTransaction.add(R.id.fragment_container, probabilityOfBIndependantEvent);
fragmentTransaction.commit();
break;
}
/* }
}
}*/
/* switch (des_calculation_type) {
case "Solve Essay problem":
String[] extractDatasetForEssayArray;
......@@ -321,6 +317,6 @@ public class ProbablilityCalculation extends AppCompatActivity {
//start activity intent1
startActivity(intent1);
startActivity(intent2);
}*/
}
}
\ No newline at end of file
}
}*/
}
\ No newline at end of file
app/src/main/res/layout/fragment_aintersection_b_dependant_event.xml
View file @ 1fba68ab
......@@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="790dp"
android:layout_height="890dp"
android:background="@drawable/cardcutbackground"
tools:context=".calculationfunction.StepsFragment.ProbabilityOfAForDependantEventFragment">
......
app/src/main/res/layout/fragment_probability_of_b_for_dependant_event.xml
View file @ 1fba68ab
......@@ -163,7 +163,6 @@
android:layout_marginEnd="11dp"
android:layout_marginBottom="510dp"
android:text="="
android:textColor="@color/design_default_color_error"
android:textSize="20sp" />
<TextView
android:id="@+id/Tetview_equjalsmb"
......@@ -175,7 +174,6 @@
android:layout_marginEnd="11dp"
android:layout_marginBottom="510dp"
android:text="="
android:textColor="@color/design_default_color_error"
android:textSize="20sp" />
<TextView
android:id="@+id/Tetvew_equjalsmb"
......@@ -187,7 +185,6 @@
android:layout_marginEnd="11dp"
android:layout_marginBottom="510dp"
android:text="="
android:textColor="@color/design_default_color_error"
android:textSize="20sp" />
<TextView
......@@ -224,7 +221,6 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="348dp"
android:text="-"
android:textColor="@color/design_default_color_error"
android:textSize="20sp" />
<TextView
......@@ -253,14 +249,13 @@
<TextView
android:id="@+id/textvijew_stp2"
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="wrap_content"
android:layout_width="13dp"
android:layout_height="42dp"
android:layout_marginStart="270dp"
android:layout_marginTop="590dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="348dp"
android:text="+"
android:textColor="@color/design_default_color_error"
android:textSize="20sp" />
<TextView
android:id="@+id/textvijew_splus"
......@@ -330,7 +325,7 @@
<TextView
android:id="@+id/textview_pbs"
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="63dp"
android:layout_width="55dp"
android:layout_height="40dp"
android:layout_marginStart="210dp"
android:layout_marginTop="640dp"
......
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