Skip to content

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

add keywordlist

parent 4a92c5c0
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 43 deletions
app/src/main/AndroidManifest.xml
View file @ 9083e62c
......@@ -50,7 +50,11 @@
<activity android:name=".Sign_up_part3" />
<activity android:name=".Sign_up_part2" />
<activity android:name=".calculationfunction.DescriptiveStatisticsCalcuation" />
<activity android:name=".calculationfunction.DisplayEssayQuestionAnsWithStepsActivity" />
<activity android:name=".inputMethod.ProbabilityCalculationIM" />
<activity android:name=".calculationfunction.ProbabilityDistributionCalculation" />
<activity
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/DisplayEssayQuestionAnsWithStepsActivity.java
View file @ 9083e62c
......@@ -413,11 +413,11 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
}
/*
if(keywordlist.contains("Mean")){
bundle.putDouble("Mean_Value", (Double) meanDlist.get(0));
bundle.putIntArray("Dataset_Values", (int[]) meanDlist.get(1));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(2));
bundle.putIntArray("Dataset_Values", (int[]) meanDlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(1));
MeanOfDistributionFragment meanOfDistributionFragment = new MeanOfDistributionFragment();
......@@ -438,7 +438,7 @@ public class DisplayEssayQuestionAnsWithStepsActivity extends AppCompatActivity
fragmentTransaction.add(R.id.sixteenLayout, varianceOfDistributionFragment);
}
*/
fragmentTransaction.commit();
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProDistCalculation.java
View file @ 9083e62c
......@@ -12,48 +12,62 @@ public class ProDistCalculation {
//----------------------------Mean_Of_Distribution----------------------------------------------------------------------
public ArrayList<Object> MeanOfDistribution(String[] a,String[] b) {
double sumofProbability=0.0;
int randomVariableX;
double probabilityvaluePx;
double meanOfProbabilityDistribution;
int sumofrandomvariable=0;
int numberOfElementinrandomvariable=0;
int numberOfElementinProbabilityvalue=0;
System.out.println("Arrays1 data"+Arrays.toString(a));
System.out.println("Arrays2 data"+Arrays.toString(b));
ArrayList<Object> list = new ArrayList<>();
// a= new String[]{"1", "2", "3"};
// b=new String[]{"0.1", "0.4", "0.5"};
int[] randomVariables = new int[a.length];
System.out.println("Randomvariablesarray"+Arrays.toString(randomVariables));
double[] probabilityvalue = new double[b.length];
System.out.println("ProbabilityValue"+Arrays.toString(probabilityvalue));
for (int k = 0; k < a.length; k++) {
try {
randomVariables[k] = Integer.parseInt(a[k]);
probabilityvalue[k]=Double.parseDouble(b[k]);
} catch (NumberFormatException e) {
e.printStackTrace();
for (int c = 0; c < b.length; c++) {
System.out.println("a[k]"+a[k]);
System.out.println("b[c]"+b[c]);
try {
randomVariables[k] = Integer.parseInt(a[k]);
probabilityvalue[c] = Double.parseDouble(b[c]);
} catch (NumberFormatException e) {
e.printStackTrace();
}
}
}
double sumofProbability=0.0;
int randomVariableX;
randomVariableX = randomVariables[a.length];
double probabilityvaluePx;
probabilityvaluePx=probabilityvalue[b.length];
double meanOfProbabilityDistribution=0.0;
sumofProbability = sumofProbability +probabilityvalue[b.length];
sumofProbability = probabilityvalue[b.length];
if (a.length == b.length && sumofProbability == 1 ){
//if (a.length == b.length && sumofProbability == 1 ){
for(int i=0; i<randomVariables.length;i++){
for (int c=0;c<probabilityvalue.length;c++){
// meanOfProbabilityDistribution = randomVariableX * probabilityvaluePx;
// meanOfProbabilityDistribution = meanOfProbabilityDistribution + i;
meanOfProbabilityDistribution = meanOfProbabilityDistribution + randomVariableX * probabilityvaluePx;
meanOfProbabilityDistribution = randomVariableX * probabilityvaluePx;
System.out.println("Mean Of Distribution:"+ meanOfProbabilityDistribution);
list.add(0, meanOfProbabilityDistribution);
list.add(1, probabilityvalue);
list.add(2, randomVariables);
}}
list.add(0, meanOfProbabilityDistribution);
list.add(1, probabilityvalue);
list.add(2, randomVariables);
//}
return list;
}
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/calculationfunction/ProbabilityDistributionCalculation.java
View file @ 9083e62c
......@@ -13,6 +13,7 @@ import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunc
import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.StepsFragment.VarianceOfDistributionFragment;
import java.util.ArrayList;
import java.util.Arrays;
public class ProbabilityDistributionCalculation extends AppCompatActivity {
......@@ -30,7 +31,9 @@ public class ProbabilityDistributionCalculation extends AppCompatActivity {
Intent intent = getIntent();
array1 = intent.getStringArrayExtra("dataset");
array2 = intent.getStringArrayExtra("dataset");
System.out.println("Array1:"+ Arrays.toString(array1));
array2 = intent.getStringArrayExtra("dataset1");
System.out.println("Array2:"+Arrays.toString(array2));
//create proDistCalculation object
......@@ -51,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(1));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(2));
bundle.putIntArray("Dataset_Values", (int[]) meanDlist.get(2));
bundle.putDoubleArray("Probability_Value", (double[]) meanDlist.get(1));
MeanOfDistributionFragment meanOfDistributionFragment = new MeanOfDistributionFragment();
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/ProbabilityDistributionsIM.java
View file @ 9083e62c
......@@ -37,9 +37,14 @@ import com.chaquo.python.android.AndroidPlatform;
import com.elearning.probabilityandstatisticsanalyserandeducator.MainActivity;
import com.elearning.probabilityandstatisticsanalyserandeducator.R;
import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.DescriptiveStatisticsCalcuation;
import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunction.ProbabilityDistributionCalculation;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.DescriptiveStatisticsCSVfile;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.DescriptiveStatisticsQuestionComparation;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ExtractData;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ExtractValueForRandomVariable;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ProbabilityDistributionQuestionComparation;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ProbabilityValue;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ProbabiltyDistributionCSVfile;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.googlecode.tesseract.android.TessBaseAPI;
import com.theartofdev.edmodo.cropper.CropImage;
......@@ -71,7 +76,8 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
Python py = null;
List<String> extractedData;
List<String> extractedData1;
List<String> extractedData2;
Integer[] valuesTakenFromEditTextArray;
// ImageView imageView, img_greyview;
......@@ -83,7 +89,9 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
//ExtractData class Instance
ExtractData extractData;
//ExtractData extractData;
ExtractValueForRandomVariable extractValueForRandomVariable;
ProbabilityValue probabilityValue;
Uri uri;
......@@ -128,12 +136,14 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
setImageProperties = new SetImageProperties();
// Arraylist to pass the data
extractedData = new ArrayList<>();
extractedData1 = new ArrayList<>();
extractedData2 = new ArrayList<>();
valuesTakenFromEditTextArray = new Integer[]{};
// initializing the object of ExtractData class
extractData = new ExtractData();
extractValueForRandomVariable = new ExtractValueForRandomVariable();
probabilityValue = new ProbabilityValue();
//intitalzing the OCR object
ocr = new OCR();
......@@ -324,36 +334,50 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
// -------------**** getting the final input from edit text
String output = textInput.getText().toString().trim();
String output1 = textInput_2.getText().toString().trim();
if (extractedData.size() == 0) {
extractedData.add(output); // adding data to List
if (extractedData1.size() == 0) {
extractedData1.add(output); // adding data to List
}
System.out.println("ExctractedData list size " + extractedData.size());
System.out.println("ExctractedData list size " + extractedData1.size());
// adding List to array in order to pass to ExtractData function
String[] dataArray = new String[extractedData.size()];
dataArray = extractedData.toArray(dataArray);
String[] dataArray1 = new String[extractedData1.size()];
dataArray1 = extractedData1.toArray(dataArray1);
if (extractedData2.size() == 0) {
extractedData2.add(output1); // adding data to List
}
System.out.println("ExctractedData1 list size " + extractedData2.size());
// adding List to array in order to pass to ExtractData function
String[] dataArray2 = new String[extractedData2.size()];
dataArray2 = extractedData2.toArray(dataArray2);
//list to receive the extrated data
List<String> extractedDataset;
List<String> extractedDataset1;
DescriptiveStatisticsQuestionComparation dsqc = new DescriptiveStatisticsQuestionComparation();
List<String> reading = readDesQuestions();
ProbabilityDistributionQuestionComparation pdqc = new ProbabilityDistributionQuestionComparation();
List<String> reading = readProbDistributionQuestions();
List<String> extractDatasetForEssay;
String[] extractDatasetForEssayArray = new String[0];
String extractedKeywordsFromFuzzy = null;
if (selectedType.equals("Solve Essay problem")) {
extractedKeywordsFromFuzzy = dsqc.DescriptiveStatisticsQuestionComparewithCSV(output, reading);
extractedKeywordsFromFuzzy = pdqc.ProbabilityDistributionComparewithCSV(output, reading);
System.out.println("extractedKeywordsFromFuzzy " + extractedKeywordsFromFuzzy);
//--------------------extrct dataset from DescripticeStatsQuesCompare class using ExtractDatasetfromDescriptiveQuestion method -----------------------------
extractDatasetForEssay = dsqc.ExtractDatasetFromDescriptiveQuestion(output);
extractDatasetForEssay = pdqc.ExtractDatasetFromDistributionQuestion(output);
System.out.println("extractDatasetForEssay " + extractDatasetForEssay);
// Converting list to array after data extraction function
......@@ -363,7 +387,8 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
}
//calling the extract data function for normal question solvings
extractedDataset = extractData.ExtractionWithComma(dataArray);
extractedDataset = extractValueForRandomVariable.InputRandomVariable(dataArray1);
extractedDataset1 = probabilityValue.ExtractionProbabilityValue(dataArray2);
//-------------------------------------------------------------------------------------------------------------------------------- remove lateer
......@@ -373,12 +398,16 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
String[] datasetArray = new String[extractedDataset.size()];
datasetArray = extractedDataset.toArray(datasetArray);
String[] datasetArray1 = new String[extractedDataset1.size()];
datasetArray1 = extractedDataset1.toArray(datasetArray1);
// System.out.println("selected Type "+selectedRadioButton.getText().toString());
Intent intent = new Intent(ProbabilityDistributionsIM.this, DescriptiveStatisticsCalcuation.class);
Intent intent = new Intent(ProbabilityDistributionsIM.this, ProbabilityDistributionCalculation.class);
intent.putExtra("dataset", datasetArray);
intent.putExtra("dataset1", datasetArray1);
intent.putExtra("des_calculation_type", selectedType);
if (selectedType.equals("Solve Essay problem")) {
......@@ -387,7 +416,9 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
}
extractedDataset.clear();
extractedDataset1.clear();
datasetArray = null;
datasetArray1 = null;
startActivity(intent);
}
......@@ -638,4 +669,47 @@ public class ProbabilityDistributionsIM extends AppCompatActivity {
return StringdescriptiveQuestions;
}
private List<String> readProbDistributionQuestions(){
String[] printQuestion = new String[500];
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"))
);
String line = "";
try {
while ((line = reader.readLine()) != null) {
//Split by '"'
String tokens = line;
//Read the csv
ProbabiltyDistributionCSVfile question = new ProbabiltyDistributionCSVfile();
question.setQuestion(tokens);
probDistributionQuestions.add(question);
StringprobdistributionQuestions.add(tokens);
//printQuestion[lines] = line;
//Log.d("MyActivity", "Just created: " + question);
}
} catch (IOException e) {
// Log.wtf("MyActivity", "Error reading data file on line " + line, e);
e.printStackTrace();
}
finally {
try {
reader.close();
}catch (IOException e) {
e.printStackTrace();
}
}
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