Skip to content

2
20_21-J03
Commit b6c9bc8d authored by Gamage B.G.N.U's avatar Gamage B.G.N.U
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c1a304dd 073c54b6
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 36 deletions
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/dataExtraction/DescriptiveStatisticsQuestionComparation.java
View file @ b6c9bc8d
......@@ -31,13 +31,12 @@ public class DescriptiveStatisticsQuestionComparation {
public String DescriptiveStatisticsQuestionComparewithCSV(String Descriptivestatisticsquestions, List<String> reading) {
System.out.println("reading des questions in dsqc "+reading);
// System.out.println("reading des questions in dsqc "+reading);
String[] keywordlist = {"first","First","second","Second","third","Third","inter","Inter","quartiles","Quartiles","range","Range","mean","Mean","x̄","μ","median","Median","mode","Mode","total","Total","dataset","Dataset","set","Set","series","Series","Data","data","average","Average","number of","Number of","population","Population","sample","Sample","parameter","Parameter","sample size","Sample size","first quartile","First Quartile","second quartile","Second Quartile","third quartile","Third Quartile","Q1","Q2","Q3","upper quartile","Upper Quartile","lower quartile","Lower Quartile","Inter quartile range","Interquartile Range","inter quartile range","IQR","maximum","Maximum","minimum","Minimum"};
String b="Determine the mean median and modal values for the set 3, 8, 10, 7, 5, 14, 2, 9, 8";
//System.out.println("value passing from python"+b);
List<String> questions ;
List<String> matchkeyword = new ArrayList<>();
......@@ -45,10 +44,8 @@ public class DescriptiveStatisticsQuestionComparation {
String[] dataReader = new String[questions.size()];
questions.toArray(dataReader);
for (int i=0; i<dataReader.length; i++){
// System.out.println("print array " + dataReader[i]);
}
//System.out.println("arrayData "+Arrays.toString(questions));
}
String questionlist = "";
for (String s : questions){
......@@ -66,8 +63,8 @@ public class DescriptiveStatisticsQuestionComparation {
String result=obj.toString();
String result1=obj1.toString();
//System.out.println("output matching: "+result);
System.out.println("matching: "+result1);
// System.out.println("output matching: "+result);
// System.out.println("matching: "+result1);
matchkeyword = QuestionMatch(result);
return result1;
......@@ -129,7 +126,6 @@ public class DescriptiveStatisticsQuestionComparation {
List<String> valueAccordingtoLine = new ArrayList<>();
String word;
// System.out.println("value for meaning of the keyword "+valueAccordingtoLine);
return valueAccordingtoLine;
}
......@@ -149,8 +145,7 @@ public class DescriptiveStatisticsQuestionComparation {
extractnumbervalues.add(matcher1.group().trim());
}
System.out.println("matched data set of extract " + extractnumbervalues);
//System.out.println("matched data set of extract " + extractnumbervalues);
return extractnumbervalues;
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/dataExtraction/StandardDeviationQuestionComparation.java
View file @ b6c9bc8d
......@@ -2,7 +2,7 @@ package com.elearning.probabilityandstatisticsanalyserandeducator.dataExtraction
import com.chaquo.python.PyObject;
import com.chaquo.python.Python;
import com.elearning.probabilityandstatisticsanalyserandeducator.inputMethod.DescriptiveSCinputMethod;
import com.elearning.probabilityandstatisticsanalyserandeducator.inputMethod.StandardDeviationInputMethod;
import java.io.BufferedReader;
import java.io.IOException;
......@@ -16,11 +16,12 @@ import java.util.regex.Pattern;
public class StandardDeviationQuestionComparation {
Python py=null;
StandardDeviationInputMethod StandardDeviationInputMethod;
String a="Find the standard deviation for the following data series: 12, 6, 7, 3, 15, 10, 18, 5";
public String StandardDeviationQuestionComparewithCSV(String Standarddeviationquestions, List<String> reading) {
System.out.println("reading std questions in standard deviation "+reading);
//System.out.println("reading std questions in standard deviation "+reading);
String[] keywordlist = {"Standard","standard","Deviation","deviation","Standard Deviation","standard deviation","Variance","variance","Skewness","skewness","Kurtosis","kurtosis","sample size","number of","population","Population","mean","Mean","parameter","sample proportion","square root","sum of square","average of square","SS","Sampling distribution","sampling distribution","proportion","mean","dataset","dispersion","spread","σ²","σ","s²","s","SD","sd","symmetric"};
......@@ -32,17 +33,14 @@ public class StandardDeviationQuestionComparation {
String[] dataReader = new String[questions.size()];
questions.toArray(dataReader);
for (int i=0; i<dataReader.length; i++){
// System.out.println("print array " + dataReader[i]);
}
//System.out.println("arrayData "+Arrays.toString(questions));
}
String questionlist = "";
for (String s : questions){
questionlist += s + "\t";
}
py = Python.getInstance();
PyObject pyo2 = py.getModule("stdquestion");
PyObject pyo21 = py.getModule("standarddeviation_keywords");
......@@ -54,7 +52,7 @@ public class StandardDeviationQuestionComparation {
String result21=obj21.toString();
//System.out.println("output matching for std: "+result2);
System.out.println("matching keywords for std: "+result21);
//System.out.println("matching keywords for std: "+result21);
matchstdkeyword = QuestionMatch(result2);
return result21;
......@@ -86,7 +84,6 @@ public class StandardDeviationQuestionComparation {
question.setQuestion(tokens);
stdQuestions.add(question);
StringstdQuestions.add(tokens);
//printQuestion[lines] = line;
//Log.d("MyActivity", "Just created: " + question);
}
......@@ -116,7 +113,6 @@ public class StandardDeviationQuestionComparation {
List<String> valueAccordingtoLine = new ArrayList<>();
String word;
// System.out.println("value for meaning of the keyword "+valueAccordingtoLine);
return valueAccordingtoLine;
}
......@@ -134,8 +130,7 @@ public class StandardDeviationQuestionComparation {
extractnumbervalues.add(matcher1.group().trim());
}
System.out.println("matched data set of extract in std "+extractnumbervalues);
//System.out.println("matched data set of extract in std "+extractnumbervalues);
return extractnumbervalues;
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/DescriptiveSCinputMethod.java
View file @ b6c9bc8d
......@@ -307,6 +307,7 @@ public class DescriptiveSCinputMethod extends AppCompatActivity {
String[] dataArray = new String[extractedData.size()];
dataArray = extractedData.toArray(dataArray);
// --------------------------------- Use DescriptiveStatisticsQuestionComparation class methods for solve essay type question --------------------------
//list to receive the extrated data
List<String> extractedDataset;
......@@ -561,6 +562,7 @@ public void showMessege(){
Toast.makeText(this,"'"+selectedRadioButton.getText().toString()+"'",Toast.LENGTH_SHORT).show();
}
//----------------------readDesQuestion method from DescriptiveStatisticsQuestionComparation class-----------------------------------------------------------------------
private List<String> readDesQuestions(){
String[] printQuestion = new String[500];
List<DescriptiveStatisticsCSVfile> descriptiveQuestions= new ArrayList<>();
......
app/src/main/java/com/elearning/probabilityandstatisticsanalyserandeducator/inputMethod/StandardDeviationInputMethod.java
View file @ b6c9bc8d
......@@ -303,7 +303,7 @@ public class StandardDeviationInputMethod extends AppCompatActivity {
dataArray = extractedData.toArray(dataArray);
//---------------------------------------------------------------------------------------------------
// --------------------------------- Use StandardDeviationQuestionComparation class methods --------------------------
// --------------------------------- Use StandardDeviationQuestionComparation class methods for solve essay type question --------------------------
//list to receive the extrated data
List<String> extractedStdDataset;
......@@ -530,7 +530,7 @@ public class StandardDeviationInputMethod extends AppCompatActivity {
Toast.makeText(this,"'"+selectedRadioButton.getText().toString()+"'",Toast.LENGTH_SHORT).show();
}
//----------------------readStdQuestion method-----------------------------------------------------------------------
//----------------------readStdQuestion method from StandardDeviationQuestionComparation class-----------------------------------------------------------------------
private List<String> readStdQuestions(){
String[] printQuestion = new String[500];
List<StandardDeviationCSVfile> stdQuestions= new ArrayList<>();
......
app/src/main/python/descriptive_questionmatching.py 0 → 100644
View file @ b6c9bc8d
from fuzzywuzzy import process
def main(data,data2):
str2match=data
stroptions=["Find mean, median for 35, 48, 53, 69, 72, 81","Determine the mean, median and modal values for the set 3, 8, 10, 7, 5, 14, 2, 9, 8","Find Q1 , Q2 , and Q3 for the following data set, and draw a box-andwhisker plot. {2,6,7,8,8,11,12,13,14,15,22,23}"]
ratio=process.extract(str2match,data2)
highest=process.extractOne(str2match,data2)
#print(ratio)
check_list=isinstance(data2,list)
#print(check_list)
#print(type(data2))
return ""+str(highest)
\ No newline at end of file
app/src/main/python/descriptivestatistics_keywords.py
View file @ b6c9bc8d
......@@ -27,11 +27,11 @@ def matchkeyword(klist,sen):
for word in Sentence.split():
try:
# print(key)
print(word)
# print(word)
res = cosdis(word2vec(word), word2vec(key))
print(res)
#print(res)
if res > threshold:
print("Found a word with cosine distance > 100 : {} with original word: {}".format(word, key))
#print("Found a word with cosine distance > 100 : {} with original word: {}".format(word, key))
matchedkeywordlist.append(word)
except IndexError:
pass
......
app/src/main/python/desstatisticsquestion.py
View file @ b6c9bc8d
......@@ -4,8 +4,8 @@ def main(data,data2):
stroptions=["Find mean, median for 35, 48, 53, 69, 72, 81","Determine the mean, median and modal values for the set 3, 8, 10, 7, 5, 14, 2, 9, 8","Find Q1 , Q2 , and Q3 for the following data set, and draw a box-andwhisker plot. {2,6,7,8,8,11,12,13,14,15,22,23}"]
ratio=process.extract(str2match,data2)
highest=process.extractOne(str2match,data2)
print(ratio)
#print(ratio)
check_list=isinstance(data2,list)
print(check_list)
print(type(data2))
#print(check_list)
#print(type(data2))
return ""+str(highest)
\ No newline at end of file
app/src/main/python/standarddeviation_keywords.py
View file @ b6c9bc8d
......@@ -27,11 +27,11 @@ def matchkeyword(klist,sen):
for word in Sentence.split():
try:
# print(key)
print(word)
#print(word)
res = cosdis(word2vec(word), word2vec(key))
print(res)
#print(res)
if res > threshold:
print("Found a word with cosine distance > 100 : {} with original word: {}".format(word, key))
#print("Found a word with cosine distance > 100 : {} with original word: {}".format(word, key))
matchedkeywordlist.append(word)
except IndexError:
pass
......
app/src/main/python/stdquestion.py
View file @ b6c9bc8d
......@@ -4,8 +4,8 @@ def main(data,data2):
stroptions=["Find the standard deviation for the following data series: 12, 6, 7, 3, 15, 10, 18, 5","Calculate the mean, sum of square, variance, and standard deviation for the following sample: 6 8 4 3 5 7 4 3","For the following data: 1 4 3 6 2 7 18 3 7 2 4 3 Compute the mean, standard deviation, median, and semi-quartile range. Then explain which measures of central tendency and variability provide a better description of the sample"]
ratio=process.extract(str2match,data2)
highest=process.extractOne(str2match,data2)
print(ratio)
#print(ratio)
check_list=isinstance(data2,list)
print(check_list)
print(type(data2))
#print(check_list)
#print(type(data2))
return ""+str(highest)
\ 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