Skip to content

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

fixed troubles in calculations

parent fd224d2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 187 deletions
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/DesStatCalculation.java
View file @ fc25676f
......@@ -24,7 +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));
// System.out.println("Invaue in median:"+Arrays.toString(invalue));
for(int k = 0; k < a.length; k++){
try {
......@@ -168,7 +168,7 @@ double firstQuartile;
for (int i = 0; i < invalue.length; i++){
if ( i == roundofPosition-1){
thirdQuartile = invalue[i];
System.out.println("iqrthirdquartile:"+thirdQuartile);
// System.out.println("iqrthirdquartile:"+thirdQuartile);
break;
}
......@@ -231,11 +231,11 @@ double firstQuartile;
list.add(2,a);
if (a.length > datasetArray.length){
System.out.println("ModesAnswer:"+modes);
System.out.println("Mode value is " + Arrays.toString(datasetArray));
// System.out.println("ModesAnswer:"+modes);
// System.out.println("Mode value is " + Arrays.toString(datasetArray));
}
else if (a.length == datasetArray.length){
System.out.println("No mode value");
// System.out.println("No mode value");
}
......@@ -350,7 +350,7 @@ double firstQuartile;
}
}
System.out.println(Arrays.toString(invalue));
// System.out.println(Arrays.toString(invalue));
for (double i : invalue) {
sumOftheDataset = sumOftheDataset + i;
noofElement++;
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/DescriptiveStatisticsCalcuation.java
View file @ fc25676f
......@@ -73,7 +73,7 @@ public class DescriptiveStatisticsCalcuation extends AppCompatActivity {
switch (des_calculation_type){
case "Mean":
bundle.putDouble("Mean_Value", (Double) meanlist.get(2));
System.out.println("MeanF:"+meanlist.get(2));
// System.out.println("MeanF:"+meanlist.get(2));
bundle.putInt("Number_of_Elements",(int)meanlist.get(1));
bundle.putDouble("Sum_of_Dataset",(double)meanlist.get(0));
bundle.putDoubleArray("Dataset_Values", (double[]) meanlist.get(3));
......@@ -199,8 +199,8 @@ public class DescriptiveStatisticsCalcuation extends AppCompatActivity {
startActivity(intent1);
}
System.out.println("desActivityArray "+Arrays.toString(array));
System.out.println("desActivityArray.length "+ array.length);
// System.out.println("desActivityArray "+Arrays.toString(array));
// System.out.println("desActivityArray.length "+ array.length);
}
}
\ No newline at end of file
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/DisplayEssayQuestionAnsWithStepsActivity.java
View file @ fc25676f
......@@ -82,9 +82,7 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
Bundle kurtosisbundle = new Bundle();
//create bundle for probabilitydistribution calculation
Bundle meanDistributionbundle = new Bundle();
Bundle stdDistributionbundle = new Bundle();
Bundle varianceDistributionbundle = new Bundle();
//intialize the layout descriptive statistic
mfirstlayout=findViewById(R.id.firstLayout);
......@@ -132,10 +130,7 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
ArrayList<Object> populationvariancelst =new ArrayList<>();
//create object for probabilitydistribution
ProDistCalculation proDistCalculation = new ProDistCalculation();
ArrayList<Object> meanDlist = new ArrayList<Object>();
ArrayList<Object> varianceDlist = new ArrayList<Object>();
ArrayList<Object> stddistributionlist = new ArrayList<Object>();
Intent intent1 = getIntent();
......@@ -144,11 +139,11 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
//---------------------------Descriptive statistics calculation-------------------------------------------------------------------------
if(extractedKeywordsFromFuzzy.contains("Mean" ) || extractedKeywordsFromFuzzy.contains("mean") || extractedKeywordsFromFuzzy.contains("x̄") || extractedKeywordsFromFuzzy.contains("μ")) {
System.out.println("insidemean:");
System.out.println("extracteddata"+Arrays.toString(extractDatasetForEssayArray));
System.out.println("extractdatasetlength:"+extractDatasetForEssayArray.length);
// System.out.println("insidemean:");
// System.out.println("extracteddata"+Arrays.toString(extractDatasetForEssayArray));
// System.out.println("extractdatasetlength:"+extractDatasetForEssayArray.length);
meanlist=desStatCalculation.Mean(extractDatasetForEssayArray);
System.out.println("meanlist"+meanlist);
// System.out.println("meanlist"+meanlist);
keywordlist.add("Mean");
}
......@@ -193,7 +188,7 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
if((extractedKeywordsFromFuzzy.contains("Inter" ) && extractedKeywordsFromFuzzy.contains("quartile")) || (extractedKeywordsFromFuzzy.contains("inter") && extractedKeywordsFromFuzzy.contains("quartile"))|| extractedKeywordsFromFuzzy.contains("iqr") || extractedKeywordsFromFuzzy.contains("IQR")) {
iqr=desStatCalculation.IQR(extractDatasetForEssayArray);
keywordlist.add("Inter quartile");
System.out.println("KeywordsIQR:"+ extractedKeywordsFromFuzzy);
// System.out.println("KeywordsIQR:"+ extractedKeywordsFromFuzzy);
}
//---------------------------Standard Deviation Calculation--------------------------------------------------------------------------------
......@@ -216,19 +211,7 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
//----------------------Probability Distribution-----------------------------------------------------------------------------------------------------------
/* if((extractedKeywordsFromFuzzy.contains("Standard" ) && extractedKeywordsFromFuzzy.contains("Deviation")) || (extractedKeywordsFromFuzzy.contains("standard" ) && extractedKeywordsFromFuzzy.contains("deviation")) || extractedKeywordsFromFuzzy.contains("σ")){
stddistributionlist=proDistCalculation.StdOfDistriution(extractDatasetForEssayArray);
keywordlist.add("Standard Deviation");
}
if(extractedKeywordsFromFuzzy.contains("Variance") || extractedKeywordsFromFuzzy.contains("variance") || extractedKeywordsFromFuzzy.contains("σ²") || extractedKeywordsFromFuzzy.contains("s²")){
varianceDlist=proDistCalculation.VarianceofDistribution(extractDatasetForEssayArray);
keywordlist.add("Variance");
}
if(extractedKeywordsFromFuzzy.contains("Mean") || extractedKeywordsFromFuzzy.contains("mean") || extractedKeywordsFromFuzzy.contains("σ²") || extractedKeywordsFromFuzzy.contains("s²")){
meanDlist=proDistCalculation.MeanOfDistribution(extractDatasetForEssayArray);
keywordlist.add("Mean");
}
*/
//Descriptive
if(keywordlist.contains("Mean")){
......@@ -399,52 +382,14 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
}
//------------------Probability Distribution------------------------------------------------------------------------
/* if(keywordlist.contains("Standard Deviation")){
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.putDouble("Mean_Distribution", (Double) stddistributionlist.get(3));
StandardDeviationDistributionFragment standardDeviationDistributionFragment = new StandardDeviationDistributionFragment();
standardDeviationDistributionFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fifteenLayout, standardDeviationDistributionFragment);
}
if(keywordlist.contains("Mean")){
bundle.putDouble("Mean_Value", (Double) meanDlist.get(0));
bundle.putIntArray("Dataset_Values", (int[]) meanDlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(1));
MeanOfDistributionFragment meanOfDistributionFragment = new MeanOfDistributionFragment();
meanOfDistributionFragment.setArguments(bundle);
fragmentTransaction.add(R.id.fourteenLayout, meanOfDistributionFragment);
}
if(keywordlist.contains("Variance")){
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.putDouble("Mean_Distribution", (Double) varianceDlist.get(3));
VarianceOfDistributionFragment varianceOfDistributionFragment = new VarianceOfDistributionFragment();
varianceOfDistributionFragment.setArguments(bundle);
fragmentTransaction.add(R.id.sixteenLayout, varianceOfDistributionFragment);
}
*/
fragmentTransaction.commit();
System.out.println("Des.extractDatasetForEssayArray:-" + Arrays.toString(extractDatasetForEssayArray));
System.out.println("Des.extractedKeywordsFromFuzzy:-" + extractedKeywordsFromFuzzy);
// System.out.println("Des.extractDatasetForEssayArray:-" + Arrays.toString(extractDatasetForEssayArray));
// System.out.println("Des.extractedKeywordsFromFuzzy:-" + extractedKeywordsFromFuzzy);
}
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProbabilityDistributionCalculation.java
View file @ fc25676f
......@@ -31,9 +31,9 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
Intent intent = getIntent();
array1 = intent.getStringArrayExtra("dataset");
System.out.println("Array1:"+ Arrays.toString(array1));
// System.out.println("Array1:"+ Arrays.toString(array1));
array2 = intent.getStringArrayExtra("dataset1");
System.out.println("Array2:"+Arrays.toString(array2));
// System.out.println("Array2:"+Arrays.toString(array2));
//create proDistCalculation object
......@@ -93,27 +93,7 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
break;
case "Solve Essay problem":
String [] extractDatasetForEssayArray ;
String extractedKeywordsFromFuzzy;
//get value from extractDatasetForEssayArray and extractedKeywordsFromFuzzy
extractDatasetForEssayArray = intent.getStringArrayExtra("extractDatasetForEssayArray");
extractedKeywordsFromFuzzy=intent.getStringExtra("extractedKeywordsFromFuzzy");
// System.out.println("desansextractDatasetForEssayArray:-"+Arrays.toString(extractDatasetForEssayArray));
// System.out.println("extlength:"+extractDatasetForEssayArray.length);
//System.out.println("desansextractedKeywordsFromFuzzy:-"+extractedKeywordsFromFuzzy);
//create intent object for parse the value from DescriptiveStatisticsCalcuation class to DisplayEssayQuestionAnsWithStepsActivity class
Intent intent1 =new Intent(ProbabilityDistributionCalculation.this, DisplayEssayQuestionAnsWithStepsActivity.class);
intent1.putExtra("extractDatasetForEssayArray",extractDatasetForEssayArray);
intent1.putExtra("extractedKeywordsFromFuzzy",extractedKeywordsFromFuzzy);
//start activity intent1
startActivity(intent1);
}
}}
\ No newline at end of file
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/StdCalculation.java
View file @ fc25676f
......@@ -43,7 +43,7 @@ public class StdCalculation {
respopulationstd = sqrt(variance);
double roundedFloat = (double) Math.round(respopulationstd * 10000.0) / 10000.0;
System.out.println("PopulationStandardDeviation:" + roundedFloat);
// System.out.println("PopulationStandardDeviation:" + roundedFloat);
list.add(0,a);
list.add(1,mean);
list.add(2,roundedFloat);
......@@ -102,7 +102,7 @@ public class StdCalculation {
double roundedFloatx = (double) Math.round(x * 10000.0) / 10000.0;
System.out.println("skewness:" + roundedFloat);
// System.out.println("skewness:" + roundedFloat);
list.add(0,a);
list.add(1,roundedFloat);
list.add(2,mean);
......@@ -160,7 +160,7 @@ public class StdCalculation {
System.out.println("Kurtosis:" + roundedFloat);
// System.out.println("Kurtosis:" + roundedFloat);
list.add(0,a);
list.add(1,roundedFloat);
list.add(2,mean);
......@@ -206,7 +206,7 @@ public class StdCalculation {
variance = x / (a.length);
double roundedFloat = (double) Math.round(variance * 10000.0) / 10000.0;
double roundedFloatx = (double) Math.round(x * 10000.0) / 10000.0;
System.out.println("Variance:" + roundedFloat);
// System.out.println("Variance:" + roundedFloat);
list.add(0, a);
list.add(1, mean);
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/dataExtraction/ExtractValueForRandomVariable.java
View file @ fc25676f
......@@ -7,7 +7,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
class ExtractValueForRandomVariable {
public class ExtractValueForRandomVariable {
List<String> randomVariable = new ArrayList<String>();
List<String> wordlist = new ArrayList<String>();
String word;
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/dataExtraction/ProbabilityDistributionQuestionComparation.java
View file @ fc25676f
package com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction;
<<<<<<< HEAD
import com.chaquo.python.PyObject;
import com.chaquo.python.Python;
=======
import android.util.Log;
import com.chaquo.python.PyObject;
......@@ -13,7 +13,7 @@ import com.elearning.probabilityandstatisticsanalyserandeducator.inputMethod.Des
import com.elearning.probabilityandstatisticsanalyserandeducator.inputMethod.ProbabilityDistributionsIM;
import org.w3c.dom.ls.LSOutput;
>>>>>>> origin/master
import java.io.BufferedReader;
import java.io.IOException;
......@@ -26,13 +26,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class ProbabilityDistributionQuestionComparation {
<<<<<<< HEAD
Python py=null;
=======
Python py=null;
ProbabilityDistributionsIM probabilityDistributionsIM;
>>>>>>> origin/master
String a="Let X and Y be two independent random variables. Suppose that we know Var(2X−Y)=6 and Var(X+2Y)=9. Find Var(X) and Var(Y).";
......@@ -47,10 +47,9 @@ public class ProbabilityDistributionQuestionComparation {
"Overtime hours,0,1,2,3,4,5,6\n" +
"Probability,0.016,0.075,0.134,0.31,0.23,0.155,0.08\n" +
"Find the standard deviation of the probability distribution. (Round to 1 decimal place as needed.)";
<<<<<<< HEAD
=======
//System.out.println("String b:" + b);
>>>>>>> origin/master
List<String> questions ;
List<String> matchprodiskeyword = new ArrayList<>();
......@@ -78,13 +77,11 @@ public class ProbabilityDistributionQuestionComparation {
String result=obj.toString();
String result1=obj1.toString();
<<<<<<< HEAD
System.out.println("output matching: "+result);
System.out.println("matching: "+result1);
=======
System.out.println("output matching: "+result);
System.out.println("matching: "+result1);
>>>>>>> origin/master
matchprodiskeyword = QuestionMatch(result);
return result;
......@@ -119,17 +116,13 @@ public class ProbabilityDistributionQuestionComparation {
StringprobdistributionQuestions.add(tokens);
//printQuestion[lines] = line;
<<<<<<< HEAD
//Log.d("MyActivity", "Just created: " + question);
}
} catch (IOException e) {
// Log.wtf("MyActivity", "Error reading data file on line " + line, e);
=======
// Log.d("MyActivity", "Just created: " + question);
}
} catch (IOException e) {
//Log.wtf("MyActivity", "Error reading data file on line " + line, e);
>>>>>>> origin/master
e.printStackTrace();
}
finally {
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/dataExtraction/ProbabilityValue.java
View file @ fc25676f
......@@ -7,7 +7,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
class ProbabilityValue {
public class ProbabilityValue {
List<String> probabilityvalue = new ArrayList<String>();
List<String> wordlist = new ArrayList<String>();
String word;
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/ProbabilityDistributionsIM.java
View file @ fc25676f
......@@ -623,11 +623,12 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
Toast.makeText(this,"'"+selectedRadioButton.getText().toString()+"'",Toast.LENGTH_SHORT).show();
}
private List<String> readDesQuestions(){
//----------------------readProbDistributionQuestion method from ProbabilityDistributionQuestionComparation class-----------------------------------------------------------------------
private List<String> readProbDistributionQuestions(){
String[] printQuestion = new String[500];
List<DescriptiveStatisticsCSVfile> descriptiveQuestions= new ArrayList<>();
List<String> StringdescriptiveQuestions= new ArrayList<>();
InputStream is = getResources().openRawResource(R.raw.sample1);
List<ProbabiltyDistributionCSVfile> probDistributionQuestions= new ArrayList<>();
List<String> StringprobdistributionQuestions= new ArrayList<>();
InputStream is = getResources().openRawResource(R.raw.propabilitydistribution);
BufferedReader reader = new BufferedReader(
new InputStreamReader(is, Charset.forName("UTF-8"))
);
......@@ -637,28 +638,21 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
String line = "";
try {
/*int lines = 0;
while(reader.readLine() != null){
lines++;
}*/
while ((line = reader.readLine()) != null) {
//Split by '"'
String tokens = line;
//Read the csv
DescriptiveStatisticsCSVfile question = new DescriptiveStatisticsCSVfile();
ProbabiltyDistributionCSVfile question = new ProbabiltyDistributionCSVfile();
question.setQuestion(tokens);
descriptiveQuestions.add(question);
StringdescriptiveQuestions.add(tokens);
probDistributionQuestions.add(question);
StringprobdistributionQuestions.add(tokens);
//printQuestion[lines] = line;
Log.d("MyActivity", "Just created: " + question);
//Log.d("MyActivity", "Just created: " + question);
}
} catch (IOException e) {
Log.wtf("MyActivity", "Error reading data file on line " + line, e);
//Log.wtf("MyActivity", "Error reading data file on line " + line, e);
e.printStackTrace();
}
finally {
......@@ -669,7 +663,7 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
}
}
return StringdescriptiveQuestions;
return StringprobdistributionQuestions;
}
}
\ No newline at end of file
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