Skip to content

Adding language argument #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chandryou wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adding language argument #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743597e
adding language argument
chandryou Oct 2, 2018
2d93ddf
adding argument for language
chandryou Oct 2, 2018
c419f28
fix bugs for language arguments
chandryou Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions R/ExtractorFromDictionary.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
#' @export
#' @examples
#' ExtractorFromDictionary()
ExtractorFromDictionary <- function(doc.df){
ExtractorFromDictionary <- function(doc.df,language){

dictionary <- diction()
if(language=="Korean") {
dictionary = kor_dictionary_db
} else {
stop("Currently only Korean is available")
}
colnames(dictionary) <- c('word')

kor_tmp_word <- c()
Expand Down
1 change: 1 addition & 0 deletions R/createTopicFromNoteSettings.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ createTopicFromNoteSettings <- function(useTopicFromNote = TRUE,
LatentDimensionForGlove = 100L,
useAutoencoder=FALSE,
LatentDimensionForAutoEncoder = 100L,
language="Korean",
sampleSize=-1){
if(sum(useDictionary) == 0){
stop('Not implemented.')
Expand Down
7 changes: 6 additions & 1 deletion R/diction.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
#' @examples
#' diction()
diction <- function(){
return(kor_dictionary_db)
if(language=="Korean") {
dicDb = kor_dictionary_db
} else {
stop("Currently only Korean is available")
}
return(dicDb)
}


Expand Down
10 changes: 5 additions & 5 deletions R/getTopicFromNoteSettings.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
if(!require(rJava)) {
install.packages('rJava')
}
if(!require(KoNLP)) {
install.packages('KoNLP')
}
# if(!require(KoNLP)) {
# install.packages('KoNLP')
# }
if(!require(devtools)) {
install.packages('devtools')
}
Expand Down Expand Up @@ -52,7 +52,7 @@ library(caret)
library(dplyr)
library(text2vec)
library(e1071)
useSejongDic()
# useSejongDic()



Expand Down Expand Up @@ -104,7 +104,7 @@ getTopicFromNoteSettings <- function(connection,
row_id <- rawCovariates$row_id
covariates_value <- rawCovariates$covariate_id

covariates <- wordToCovariate(row_id,covariates_value,useDictionary)
covariates <- wordToCovariate(row_id,covariates_value,useDictionary,language=covariateSettings$language)

# Convert colum names to camelCase:
colnames(covariates) <- SqlRender::snakeCaseToCamelCase(colnames(covariates))
Expand Down
4 changes: 2 additions & 2 deletions R/wordToCovariate.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#' @export
#' @examples
#' wordToCovariate()
wordToCovariate <- function(rowid,covariatesvalue,useDictionary){
wordToCovariate <- function(rowid,covariatesvalue,useDictionary,language){

result_xml_df <- NoteXmlParser(rowid,covariatesvalue)

doc.df <- LanguagePreProcessingFunction(result_xml_df)

df <- ExtractorFromDictionary(doc.df)
df <- ExtractorFromDictionary(doc.df,language)
df <- cbind(df,rep(1,nrow(df)))
colnames(df) <- c('row_id','covariate_id','covariate_value')

Expand Down