create essay type question for probability calculation

app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/IndepeEssayTypeProCalc.java

@@ -18,6 +18,8 @@ import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunc
 import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.ProbabilityOfAIndependantEvent;
 import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.ProbabilityOfBForDependantEventFragment;
 import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.ProbabilityOfBIndependantEvent;
+import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.TypeThreeIndeAUnionBFragment;
+import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.TypeTwoA_Union_B_IndeFragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,6 +31,8 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
     FrameLayout meightlayout;
     FrameLayout mninelayout;
     FrameLayout mtenlayout;
+    FrameLayout melevenlayout;
+    FrameLayout mtwelevelayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -37,20 +41,24 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
 
         FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
 
-        //create bundle for standarddeviation calculation
+        //create bundle for probability calculation
 
         Bundle A_intersection_B_Indep_bundle = new Bundle();
         Bundle A_union_B_Indep_bundle = new Bundle();
         Bundle B_Indep_bundle = new Bundle();
         Bundle A_Indep_bundle = new Bundle();
+        Bundle A_union_B_Type2 = new Bundle();
+        Bundle A_union_B_Type3 = new Bundle();
 
 
 
-        //intialize the layout standard deviation calculation
+        //intialize the layout probability calculation
         mseventhlayout =findViewById(R.id.sevenLayout);
         meightlayout =findViewById(R.id.eightLayout);
         mninelayout =findViewById(R.id.nineLayout);
         mtenlayout =findViewById(R.id.tenLayout);
+        melevenlayout =findViewById(R.id.elevenLayout);
+        mtwelevelayout =findViewById(R.id.tweleveLayout);
 
 
 
@@ -65,6 +73,8 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
         ArrayList<Object> InDepProbabilityofBlist = new ArrayList<Object>();
         ArrayList<Object> InDepProbabilityofAandBlist = new ArrayList<Object>();
         ArrayList<Object> InDepProbabilityofAorBlist = new ArrayList<Object>();
+        ArrayList<Object> IndDepProbabilityofAUnionBType2list = new ArrayList<Object>();
+        ArrayList<Object> IndDepProbabilityofAUnionBType3list = new ArrayList<Object>();
 
 
 
@@ -75,9 +85,9 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
         extractedKeywordsFromFuzzy =intent1.getStringExtra("extractedKeywordsFromFuzzy");
         System.out.println("StandardDeviationextractedKeywordsFromFuzzy"+extractedKeywordsFromFuzzy);
 
-/*
-        //---------------------------Probability Calculation--------------------------------------------------------------------------------
 
+        //---------------------------Probability Calculation--------------------------------------------------------------------------------
+/*
     if(extractedKeywordsFromFuzzy.contains("P(A)") || extractedKeywordsFromFuzzy.contains("variance") || extractedKeywordsFromFuzzy.contains("σ²") || extractedKeywordsFromFuzzy.contains("s²")){
         InDepProbabilityofAlist=probabilityCalc.IndependantProbabilityA(extractDatasetForEssayArray,extractDatasetForEssayArray);
             keywordlist.add("P(A)");
@@ -86,10 +96,14 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
             InDepProbabilityofAandBlist=probabilityCalc.InDepProAandB(extractDatasetForEssayArray,extractDatasetForEssayArray);
             keywordlist.add("P(A and B)");
         }
+
         if(extractedKeywordsFromFuzzy.contains("P(A or B)") || extractedKeywordsFromFuzzy.contains("kurtosis")){
             InDepProbabilityofAorBlist=probabilityCalc.Independant_A_Union_B(extractDatasetForEssayArray,extractDatasetForEssayArray);
+            IndDepProbabilityofAUnionBType2list=probabilityCalc.Independant_A_Union_B_Type2(extractDatasetForEssayArray,extractDatasetForEssayArray);
+            IndDepProbabilityofAUnionBType3list=probabilityCalc.Independant_A_Union_B_Type3(extractDatasetForEssayArray,extractDatasetForEssayArray);
             keywordlist.add("P(A or B)");
         }
+
         if(extractedKeywordsFromFuzzy.contains("P(B)") || extractedKeywordsFromFuzzy.contains("variance") || extractedKeywordsFromFuzzy.contains("σ²") || extractedKeywordsFromFuzzy.contains("s²")){
             InDepProbabilityofBlist=probabilityCalc.IndependantProbabilityB(extractDatasetForEssayArray,extractDatasetForEssayArray);
             keywordlist.add("P(B)");
@@ -125,6 +139,30 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
 
         }
         if(keywordlist.contains("P(A or B)")){
+          /*  if (ProbabilityvalueA == null){
+                A_union_B_Type2.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType2list.get(0));
+                A_union_B_Type2.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType2list.get(3));
+                A_union_B_Type2.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType2list.get(1));
+                A_union_B_Type2.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(A_union_B_Type2);
+                fragmentTransaction.add(R.id.elevenLayout, typeTwoA_union_b_indeFragment);
+
+
+            }else if (ProbabilityvalueB == null){
+                A_union_B_Type3.putDouble("ProbabilityA_value", (Double) IndDepProbabilityofAUnionBType3list.get(0));
+                A_union_B_Type3.putDouble("ProbabilityB_value", (Double) IndDepProbabilityofAUnionBType3list.get(3));
+                A_union_B_Type3.putDouble("ProbabilityAandB_value", (Double) IndDepProbabilityofAUnionBType3list.get(1));
+                A_union_B_Type3.putDouble("ProbabilityAorB_value", (Double) IndDepProbabilityofAUnionBType3list.get(2));
+
+
+                TypeThreeIndeAUnionBFragment typeThreeIndeAUnionBFragment = new TypeThreeIndeAUnionBFragment();
+                typeThreeIndeAUnionBFragment.setArguments(A_union_B_Type3);
+                fragmentTransaction.add(R.id.tweleveLayout, typeThreeIndeAUnionBFragment);
+
+            }else
             A_union_B_Indep_bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAorBlist.get(0));
             A_union_B_Indep_bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAorBlist.get(3));
             A_union_B_Indep_bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAorBlist.get(1));
@@ -134,7 +172,7 @@ public class IndepeEssayTypeProCalc extends AppCompatActivity {
             IndeAunionBFragment indeAunionBFragment = new IndeAunionBFragment();
             indeAunionBFragment.setArguments(A_union_B_Indep_bundle);
             fragmentTransaction.add(R.id.nineLayout, indeAunionBFragment);
-
+*/
 
         }
         if(keywordlist.contains("P(B)")){

app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProbablilityCalculation.java

@@ -65,6 +65,7 @@ public class ProbablilityCalculation extends AppCompatActivity {
         ArrayList<Object> DepProbabilityofA_Blist = new ArrayList<Object>();
         ArrayList<Object> DepProbabilityofB_Alist = new ArrayList<Object>();
         ArrayList<Object> IndDepProbabilityofAUnionBType2list = new ArrayList<Object>();
+        ArrayList<Object> IndDepProbabilityofAUnionBType3list = new ArrayList<Object>();
 
 
 
@@ -84,7 +85,7 @@ public class ProbablilityCalculation extends AppCompatActivity {
         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);
 
         des_calculation_type = intent.getStringExtra("des_calculation_type");
         Probability_Type=intent.getStringExtra("des_calculation_type");
@@ -215,10 +216,10 @@ public class ProbablilityCalculation extends AppCompatActivity {
                          break;
 
                      }else if (ProbabilityvalueB == null){
-                         bundle.putDouble("ProbabilityA_value", (Double) InDepProbabilityofAorBlist.get(0));
-                         bundle.putDouble("ProbabilityB_value", (Double) InDepProbabilityofAorBlist.get(3));
-                         bundle.putDouble("ProbabilityAandB_value", (Double) InDepProbabilityofAorBlist.get(1));
-                         bundle.putDouble("ProbabilityAorB_value", (Double) InDepProbabilityofAorBlist.get(2));
+                         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();

app/src/main/res/layout/activity_indepe_essay_type_pro_calc.xml

@@ -43,6 +43,20 @@
             android:id="@+id/tenLayout">
 
 
+        </FrameLayout>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/elevenLayout">
+
+
+        </FrameLayout>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/tweleveLayout">
+
+
         </FrameLayout>
 
     </LinearLayout>