Skip to content
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

Jump to bottom

Extend frequencytable() function #54

Merged
merged 9 commits into from
Nov 2, 2017
Merged

Extend frequencytable() function #54

merged 9 commits into from
Nov 2, 2017

Conversation

nilsreiter
Copy link
Member

Some logical arguments want to be merged (byAct, byFigure, ...) into string argument by, similar to other functions.

nilsreiter and others added 6 commits October 19, 2017 22:00
@nilsreiter
Update CONTRIBUTING.md
983def8
Add byScene and byAct parameters for frequencytable-function.
87562f4
Revert "Update CONTRIBUTING.md"
7ae3665 
This reverts commit 983def8.
Add modified frequencytable2-function, simplified frequencytable.
7cf59a8
Undo unintentional revert of CONTRIBUTING.md
e01d58c
Merge branch 'develop' into features/frequencytable-41
63713af 
* develop: (61 commits)
  documentation change following 62e9ca5
  dataDirectory now has a default option
  added additional data sources
  fix #53
  better to use "stringsAsFactors" than as.is
  explicitly converting date to string
  no more automatic conversion to factor #53
  added FigureMention type
  ignoring CONTRIBUTING.md
  preventing notes
  added missing parameter
  fix #48
  updated documentation
  Updated function to use collectionDirectory option #44
  new exporter interface
  Updated report to some internal changes
  fix output location of report #34
  Change after adding collection id column
  fix #34, moved report to inst/rmd
  added GDC as a download option
  ...
@nilsreiter nilsreiter modified the milestone: 1.1.0 Oct 21, 2017
@nilsreiter nilsreiter removed their assignment Oct 21, 2017
@nilsreiter nilsreiter modified the milestones: 1.1.0, 1.2.0 Oct 23, 2017
@nilsreiter nilsreiter assigned t-lini and unassigned t-lini Oct 24, 2017
Change logical arguments 'byAct' and 'byScene' into single string arg…
51a542b 
…ument 'by'.

Change default value of 'normalize'-argument to FALSE.
@nilsreiter
Copy link
Member Author

@TimStrohmayer Kannst Du in der Funktion tfidf(), in der Datei text.R, noch das Beispiel anpassen? Da wird frequencytable() aufgerufen, und da müsste jetzt noch die Normalisierung angeschaltet werden ...

@nilsreiter nilsreiter merged commit e3a66f7 into develop Nov 2, 2017
@nilsreiter nilsreiter deleted the DramaAnalysis-Tim branch November 2, 2017 14:07
@nilsreiter nilsreiter modified the milestones: 1.2.0, 1.1.1 Nov 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@t-lini t-lini

Labels
enhancement
Projects
None yet
Milestone
1.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@nilsreiter @t-lini