Skip to content

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

fixed troubles in probability distribution caculation

parent 9083e62c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 130 deletions
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/DesStatCalculation.java
View file @ e358c72d
......@@ -24,6 +24,7 @@ public class DesStatCalculation {
public ArrayList<Object> Median(String[] a ) {
ArrayList<Object> list = new ArrayList<>();
double[] invalue = new double[a.length];
System.out.println("Invaue in median:"+Arrays.toString(invalue));
for(int k = 0; k < a.length; k++){
try {
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProbabilityDistributionCalculation.java
View file @ e358c72d
......@@ -54,8 +54,8 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
switch (des_calculation_type){
case "Mean (expectation) of a distribution":
bundle.putDouble("Mean_Value", (Double) meanDlist.get(0));
bundle.putIntArray("Dataset_Values", (int[]) meanDlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(1));
bundle.putStringArray("Dataset_Values", (String[]) meanDlist.get(2));
bundle.putStringArray("Probability_Value", (String[]) meanDlist.get(1));
MeanOfDistributionFragment meanOfDistributionFragment = new MeanOfDistributionFragment();
......@@ -66,8 +66,8 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
case "Variance of a distribution":
bundle.putDouble("Variance_Value", (Double) varianceDlist.get(0));
bundle.putIntArray("Dataset_Values", (int[]) varianceDlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) varianceDlist.get(1));
bundle.putStringArray("Dataset_Values", (String[]) varianceDlist.get(2));
bundle.putStringArray("Probability_Value", (String[]) varianceDlist.get(1));
bundle.putDouble("Mean_Distribution", (Double) varianceDlist.get(3));
......@@ -79,8 +79,8 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
case "Standard Deviation of a distribution":
bundle.putDouble("std_Value", (Double) stddistributionlist.get(0));
bundle.putIntArray("Dataset_Values", (int[]) stddistributionlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) stddistributionlist.get(1));
bundle.putStringArray("Dataset_Values", (String[]) stddistributionlist.get(2));
bundle.putStringArray("Probability_Value",(String[]) stddistributionlist.get(1));
bundle.putDouble("Mean_Distribution", (Double) stddistributionlist.get(3));
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/StepsFragment/MeanOfDistributionFragment.java
View file @ e358c72d
......@@ -46,12 +46,12 @@ public class MeanOfDistributionFragment extends Fragment {
Double meanofdistribution = bundle.getDouble("Mean_Value");
int[] datasetValues = bundle.getIntArray("Dataset_Values") ;
String[] datasetValues = bundle.getStringArray("Dataset_Values") ;
String data = Arrays.toString(datasetValues);
String data2 = data.replace('[',' ' );
String data3 = data2.replace(']',' ');
double[] probabilityvalue = bundle.getDoubleArray("Probability_Value");
String[] probabilityvalue = bundle.getStringArray("Probability_Value");
String data4 = Arrays.toString(probabilityvalue);
String data5 = data4.replace('[',' ' );
String data6 = data5.replace(']',' ');
......@@ -60,9 +60,11 @@ public class MeanOfDistributionFragment extends Fragment {
mfinalAnswer.setText(meanofdistribution.toString());
mdatasetvalues.setText(data3);
mtextviewmeananswer.setText(data3);
mtextviewmeananswer.setText(meanofdistribution.toString());
mtextviewresultpx.setText(data6);
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/StepsFragment/StandardDeviationDistributionFragment.java
View file @ e358c72d
......@@ -49,12 +49,12 @@ public class StandardDeviationDistributionFragment extends Fragment {
Double stdDistribution = bundle.getDouble("std_Value");
Double meandistribution = bundle.getDouble("Mean_Distribution");
int[] datasetValues = bundle.getIntArray("Dataset_Values") ;
String[] datasetValues = bundle.getStringArray("Dataset_Values") ;
String data = Arrays.toString(datasetValues);
String data2 = data.replace('[',' ' );
String data3 = data2.replace(']',' ');
double[] probabilityvalue = bundle.getDoubleArray("Probability_Value");
String[] probabilityvalue = bundle.getStringArray("Probability_Value");
String data4 = Arrays.toString(probabilityvalue);
String data5 = data4.replace('[',' ' );
String data6 = data5.replace(']',' ');
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/StepsFragment/VarianceOfDistributionFragment.java
View file @ e358c72d
......@@ -48,12 +48,12 @@ public class VarianceOfDistributionFragment extends Fragment {
Double varianceofdistribution = bundle.getDouble("Variance_Value");
int[] datasetValues = bundle.getIntArray("Dataset_Values") ;
String[] datasetValues = bundle.getStringArray("Dataset_Values") ;
String data = Arrays.toString(datasetValues);
String data2 = data.replace('[',' ' );
String data3 = data2.replace(']',' ');
double[] probabilityvalue = bundle.getDoubleArray("Probability_Value");
String[] probabilityvalue = bundle.getStringArray("Probability_Value");
String data4 = Arrays.toString(probabilityvalue);
String data5 = data4.replace('[',' ' );
String data6 = data5.replace(']',' ');
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/ProbabilityDistributionsIM.java
View file @ e358c72d
......@@ -60,6 +60,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ProbabilityDistributionsIM extends AppCompatActivity {
......@@ -407,7 +408,9 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
Intent intent = new Intent(ProbabilityDistributionsIM.this, ProbabilityDistributionCalculation.class);
intent.putExtra("dataset", datasetArray);
System.out.println("PDdataset:"+ Arrays.toString(datasetArray));
intent.putExtra("dataset1", datasetArray1);
System.out.println("PDdataset1:"+Arrays.toString(datasetArray1));
intent.putExtra("des_calculation_type", selectedType);
if (selectedType.equals("Solve Essay problem")) {
......
app/src/main/res/layout/fragment_mean_of_distribution.xml
View file @ e358c72d
......@@ -141,8 +141,9 @@
android:layout_marginEnd="200dp"
android:layout_marginBottom="176dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textSize="15sp"
android:textStyle="bold"
android:textColor="#008000"/>
<TextView
......
app/src/main/res/layout/fragment_standard_deviation_distribution.xml
View file @ e358c72d
......@@ -13,7 +13,7 @@
android:layout_width="192dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginTop="350dp"
android:layout_marginTop="280dp"
android:layout_marginEnd="311dp"
android:layout_marginBottom="215dp"
android:text="Explanation"
......@@ -26,7 +26,7 @@
android:layout_width="127dp"
android:layout_height="43dp"
android:layout_marginStart="2dp"
android:layout_marginTop="590dp"
android:layout_marginTop="460dp"
android:layout_marginEnd="311dp"
android:layout_marginBottom="215dp"
android:text="Mean (μ)"
......@@ -39,7 +39,7 @@
android:layout_width="49dp"
android:layout_height="35dp"
android:layout_marginStart="130dp"
android:layout_marginTop="590dp"
android:layout_marginTop="460dp"
android:layout_marginEnd="311dp"
android:layout_marginBottom="215dp"
android:text="="
......@@ -52,26 +52,26 @@
android:layout_width="197dp"
android:layout_height="43dp"
android:layout_marginStart="160dp"
android:layout_marginTop="590dp"
android:layout_marginTop="460dp"
android:layout_marginEnd="311dp"
android:layout_marginBottom="215dp"
android:background="@drawable/border"
android:textSize="25sp"
android:textSize="20sp"
android:textStyle="bold" />
<TextView
android:id="@+id/Textview_Step1"
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="388dp"
android:layout_width="378dp"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="80dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="11dp"
android:layout_marginBottom="510dp"
android:textSize="20sp"
android:text="You entered the following dataset X"
android:textColor="@color/design_default_color_error"
android:text="You entered the following dataset X" />
android:textSize="20sp" />
<TextView
android:id="@+id/Textview_Step8"
......@@ -79,7 +79,7 @@
android:layout_width="388dp"
android:layout_height="30dp"
android:layout_marginStart="3dp"
android:layout_marginTop="160dp"
android:layout_marginTop="110dp"
android:layout_marginEnd="11dp"
android:layout_marginBottom="510dp"
android:text="You entered the following dataset P(X)"
......@@ -92,7 +92,7 @@
android:layout_width="403dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="250dp"
android:layout_marginTop="190dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="348dp"
android:textSize="20sp"
......@@ -106,14 +106,13 @@
android:layout_width="386dp"
android:layout_height="43dp"
android:layout_marginStart="1dp"
android:layout_marginTop="110dp"
android:layout_marginTop="65dp"
android:layout_marginEnd="179dp"
android:layout_marginBottom="458dp"
android:background="@drawable/border"
android:scrollbars="vertical"
android:textSize="17sp"
android:textStyle="bold"
android:background="@drawable/border"
/>
android:textStyle="bold" />
<TextView
android:id="@+id/textview_stdvalueansw"
......@@ -121,7 +120,7 @@
android:layout_width="386dp"
android:layout_height="43dp"
android:layout_marginStart="1dp"
android:layout_marginTop="310dp"
android:layout_marginTop="240dp"
android:layout_marginBottom="288dp"
android:textSize="17sp"
android:textStyle="bold"
......@@ -134,7 +133,7 @@
android:layout_width="404dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="390dp"
android:layout_marginTop="310dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="156dp"
android:text="In order to find the standard deviation of the given distribution, we will use the following formula:"
......@@ -144,10 +143,10 @@
<TextView
android:id="@+id/txtview_step3sofdatas"
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="398dp"
android:layout_height="78dp"
android:layout_width="417dp"
android:layout_height="71dp"
android:layout_marginStart="1dp"
android:layout_marginTop="640dp"
android:layout_marginTop="520dp"
android:layout_marginEnd="176dp"
android:layout_marginBottom="96dp"
android:text="So, first we need to multiply each value of X by each probability P(X), then add these results together"
......@@ -159,8 +158,8 @@
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="381dp"
android:layout_height="37dp"
android:layout_marginStart="5dp"
android:layout_marginTop="20dp"
android:layout_marginStart="1dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="309dp"
android:layout_marginBottom="586dp"
android:text="Result - Standard Deviation"
......@@ -173,14 +172,15 @@
<TextView
android:id="@+id/textviewfinalanswer"
style="@style/Base.TextAppearance.AppCompat.Large"
android:layout_width="392dp"
android:layout_height="wrap_content"
android:layout_marginStart="1dp"
android:layout_marginTop="720dp"
android:layout_width="261dp"
android:layout_height="43dp"
android:layout_marginStart="10dp"
android:layout_marginTop="600dp"
android:layout_marginEnd="200dp"
android:layout_marginBottom="176dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textColor="#008000"
android:textSize="20sp"
android:textStyle="bold" />
......@@ -190,7 +190,7 @@
android:layout_width="386dp"
android:layout_height="43dp"
android:layout_marginStart="1dp"
android:layout_marginTop="200dp"
android:layout_marginTop="140dp"
android:layout_marginEnd="200dp"
android:layout_marginBottom="176dp"
android:scrollbars="vertical"
......@@ -202,9 +202,9 @@
android:id="@+id/imageView3"
style="@style/Animation.Design.BottomSheetDialog"
android:layout_width="296dp"
android:layout_height="81dp"
android:layout_height="54dp"
android:layout_marginStart="50dp"
android:layout_marginTop="480dp"
android:layout_marginTop="400dp"
android:layout_marginEnd="200dp"
android:layout_marginBottom="176dp"
android:background="@drawable/border"
......
app/src/main/res/layout/fragment_variance_of_distribution.xml
View file @ e358c72d
......@@ -180,7 +180,8 @@
android:layout_marginBottom="176dp"
android:background="@drawable/border"
android:textSize="17sp"
android:textStyle="bold" />
android:textStyle="bold"
android:textColor="#008000"/>
<TextView
......
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