Skip to content

2
20_21-J03
Commit 49076a9a authored by Vyshna-Sri's avatar Vyshna-Sri
Browse files
Options

Updated code for probability calculation question

parent c432c8f9
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/ProbabilityCalculationIM.java
View file @ 49076a9a
......@@ -48,6 +48,9 @@ import com.elearning.probabilityandstatisticsanalyserandeducator.calculationfunc
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.DescriptiveStatisticsCSVfile;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.DescriptiveStatisticsQuestionComparation;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ExtractData;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.FractionValue;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ProbabilityCalculationCSVfile;
import com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction.ProbabilityCalculationQuestionComparation;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.googlecode.tesseract.android.TessBaseAPI;
import com.theartofdev.edmodo.cropper.CropImage;
......@@ -88,8 +91,8 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
EditText PA, PB, PAandB, PAorB, PAB, PBA;
//ExtractData class Instance
ExtractData extractData;
//FractionValue class Instance
FractionValue fractionValue;
Uri uri;
......@@ -113,7 +116,7 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_probability_calculation_i_m);
// ---------------------------------------------------------------------------------------- for spinner
// ---------------------------------------------------------------------------------------- for spinner
isDependent = findViewById(R.id.spinner1);
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,R.array.isDependent, android.R.layout.simple_spinner_item);
......@@ -150,8 +153,8 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
valuesTakenFromEditTextArray = new Integer[]{};
// initializing the object of ExtractData class
extractData = new ExtractData();
// initializing the object of FractionValue class
fractionValue = new FractionValue();
//intitalzing the OCR object
ocr = new OCR();
......@@ -325,18 +328,18 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
// System.out.println("ExctractedData list size " + extractedData.size());
// adding List to array in order to pass to ExtractData function
// adding List to array in order to pass to FractionValue function
String[] dataArray = new String[extractedData.size()];
dataArray = extractedData.toArray(dataArray);
// --------------------------------- Use DescriptiveStatisticsQuestionComparation class methods for solve essay type question --------------------------
// --------------------------------- Use ProbabilityCalculationQuestionComparation class methods for solve essay type question --------------------------
//list to receive the extrated data
List<String> extractedDataset;
List<Double> extractedDataset;
DescriptiveStatisticsQuestionComparation dsqc = new DescriptiveStatisticsQuestionComparation();
List<String> reading = readDesQuestions();
ProbabilityCalculationQuestionComparation pcqc = new ProbabilityCalculationQuestionComparation();
List<String> reading = readProCalQuestions();
List<String> extractDatasetForEssay;
List<String> extractNumbervalue;
String[] extractDatasetForEssayArray = new String[0];
......@@ -346,11 +349,11 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
if (selectedType.equals("Solve Essay problem")) {
extractedKeywordsFromFuzzy = dsqc.DescriptiveStatisticsQuestionComparewithCSV(output, reading);
extractedKeywordsFromFuzzy = pcqc.ProbabilityCalculationomparewithCSV(output, reading);
// System.out.println("extractedKeywordsFromFuzzy " + extractedKeywordsFromFuzzy);
//--------------------extrct dataset from DescripticeStatsQuesCompare class using ExtractDatasetfromDescriptiveQuestion method -----------------------------
//--------------------extrct dataset from DescripticeStatsQuesCompare class using ExtractDatasetfromProbCalculationQuestion method -----------------------------
extractDatasetForEssay = dsqc.ExtractDatasetFromDescriptiveQuestion(output);
extractDatasetForEssay = pcqc.ExtractProbValueFromCalculationQuestion(output);
// System.out.println("extractDatasetForEssay " + extractDatasetForEssay);
//System.out.println("Common elements == "+common);
......@@ -361,7 +364,7 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
}
//calling the extract data function for normal question solvings
extractedDataset = extractData.ExtractionWithComma(dataArray);
extractedDataset = fractionValue.fractionToDouble(output);
//-------------------------------------------------------------------------------------------------------------------------------- remove lateer
......@@ -580,7 +583,7 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
public void run() {
//setting extracted value to editText
openDialog(result);
// textInput.setText(result);
// textInput.setText(result);
}
});
......@@ -602,11 +605,11 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
Toast.makeText(this,"'"+selectedRadioButton.getText().toString()+"'",Toast.LENGTH_SHORT).show();
}
//----------------------readDesQuestion method from DescriptiveStatisticsQuestionComparation class-----------------------------------------------------------------------
private List<String> readDesQuestions(){
//----------------------readProCalQuestion method from ProbabilityCalculationQuestionComparation class-----------------------------------------------------------------------
private List<String> readProCalQuestions(){
String[] printQuestion = new String[500];
List<DescriptiveStatisticsCSVfile> descriptiveQuestions= new ArrayList<>();
List<String> StringdescriptiveQuestions= new ArrayList<>();
List<ProbabilityCalculationCSVfile> proCalcQuestions= new ArrayList<>();
List<String> StringprocalcQuestions= new ArrayList<>();
InputStream is = getResources().openRawResource(R.raw.sample1);
BufferedReader reader = new BufferedReader(
new InputStreamReader(is, Charset.forName("UTF-8"))
......@@ -629,10 +632,10 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
String tokens = line;
//Read the csv
DescriptiveStatisticsCSVfile question = new DescriptiveStatisticsCSVfile();
ProbabilityCalculationCSVfile question = new ProbabilityCalculationCSVfile();
question.setQuestion(tokens);
descriptiveQuestions.add(question);
StringdescriptiveQuestions.add(tokens);
proCalcQuestions.add(question);
StringprocalcQuestions.add(tokens);
//printQuestion[lines] = line;
//Log.d("MyActivity", "Just created: " + question);
......@@ -649,7 +652,7 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
}
}
return StringdescriptiveQuestions;
return StringprocalcQuestions;
}
//Function to run the dialog box
......@@ -660,5 +663,5 @@ public class ProbabilityCalculationIM extends AppCompatActivity implements Adapt
input_dialog.show(getSupportFragmentManager(),"Input Dialog");
}
}
\ 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