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.

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

Fix new bing search api #2

Open
wants to merge 283 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
283 commits
Select commit Hold shift + click to select a range
d3f415c
Minor API fixes.
brodecva Jun 27, 2016
6af12c8
Merge remote-tracking branch 'origin/InterpreterInstanceImpl' into de…
brodecva Jun 27, 2016
b64f7e5
Merge pull request #77 from odalic/develop
josef-janousek Jun 27, 2016
2bb2c92
Class for testing the execution of interpreter from Odalic project
josef-janousek Jun 27, 2016
a7ce566
Add method for setting IgnoreColumns to SemanticTableInterpreter and …
josef-janousek Jun 28, 2016
cd54afa
Add support for setting of IgnoreColumns for interpreter from Executi…
josef-janousek Jun 28, 2016
6fd5ec0
API output format change (index mapping changed to nested, chosen flag).
brodecva Jun 29, 2016
f9c7963
Merge remote-tracking branch 'origin/InterpreterInstanceImpl' into de…
brodecva Jun 29, 2016
463c3f3
Interpreter instantiation adapted to Spring DI.
brodecva Jun 29, 2016
cf05258
File resource fixes.
brodecva Jun 29, 2016
9958ed1
#70 - Fixed pom conflicts and hidden some compilation warnings, that …
JanVana Jun 29, 2016
7696b43
#70 - Fixed pom conflicts and hidden some compilation warnings, that …
JanVana Jun 29, 2016
e9a4b23
File resource POST method implemented.
brodecva Jun 30, 2016
8d35fec
Task resource fixes.
brodecva Jun 30, 2016
60c477b
Entity candidate serialization fix.
brodecva Jun 30, 2016
b1265bd
Execution fixes.
brodecva Jun 30, 2016
81502ff
Merge remote-tracking branch 'origin/Dbpedia' into develop
brodecva Jun 30, 2016
14733db
Guava conflict fixed.
brodecva Jun 30, 2016
77e8924
Parser forced to use UTF8 as the detection is broken.
brodecva Jul 1, 2016
8652ef9
Draft dropped (for now), file logging switched off for core.
brodecva Jul 4, 2016
4596a72
#72 - TAnnotation to Result conversion
JanVana Jul 4, 2016
bf5475e
Feedback conversion NullPointerException fix.
brodecva Jul 4, 2016
c0b6b4c
Merge branch 'develop' of https://github.com/odalic/sti.git into develop
brodecva Jul 4, 2016
450f9d0
Added constructor for TableMinerPlustFactory taking sti.properties path.
brodecva Jul 4, 2016
9410450
#70 - DBpedia configs
JanVana Jul 5, 2016
13bb2bb
#70 - Minor fixes and hacks to get the DBpedia working on test data
JanVana Jul 5, 2016
d7cc202
#72 - TAnnotation to Result conversion fixes
JanVana Jul 5, 2016
c4c4b68
Merge branch 'develop' of https://github.com/odalic/sti into develop
JanVana Jul 5, 2016
a2dd308
Final polish for the first iteration.
brodecva Jul 6, 2016
d89be11
Merge branch 'develop' of https://github.com/odalic/sti.git into develop
brodecva Jul 6, 2016
5adc1e4
Result output fix.
brodecva Jul 6, 2016
bbba918
Ascending order candidate fix.
brodecva Jul 6, 2016
2e06183
#78 - Manual merge of changes from the Ziqizhang/sti branch
JanVana Jul 11, 2016
4fbaca9
Merge pull request #85 from odalic/DBpedia_ziqi
brodecva Jul 13, 2016
8904c75
Merge pull request #86 from odalic/develop
brodecva Jul 13, 2016
fbad19b
#6, #74, #80 - First iteration
JanVana Jul 19, 2016
35098f1
Added dependency needed to build the project
tomas-knap Jul 20, 2016
c039c02
Adjusted kbsearch implementation - refactoring
tomas-knap Jul 20, 2016
a76d420
Merge remote-tracking branch 'origin/CSVInput' into develop
brodecva Jul 21, 2016
d1af01f
Cleaning-up of the merged CSV parsing code.
brodecva Jul 21, 2016
4db0428
New CSV parser integration.
brodecva Jul 25, 2016
15841a5
New CSV parser Spring configuration.
brodecva Jul 25, 2016
a534faf
Move of input package to the odalic root package.
brodecva Jul 26, 2016
09fa9d6
Configuration extended with primary knowledge base specification.
brodecva Jul 26, 2016
6522d04
Primary base field name fix (camel case to underscore notation).
brodecva Jul 26, 2016
3590b81
Pulling up common methods and fields.
brodecva Jul 27, 2016
50af2b5
Code duplication removal.
brodecva Jul 27, 2016
33ebecf
Added encoding of the ID when put out as a part of a URL.
brodecva Jul 27, 2016
dfb7e71
Merge pull request #98 from odalic/fix-spaces-in-task-id
brodecva Jul 27, 2016
1876d0a
Root pom set.
brodecva Jul 30, 2016
a8374ff
JDK set to Oracle JDK 8.
brodecva Jul 30, 2016
2b3bc52
Manual mvn install of libs added.
brodecva Jul 30, 2016
8d2b4e7
Memory limits for Maven set.
brodecva Jul 30, 2016
716380c
Merge pull request #100 from odalic/feature-root-pom
brodecva Jul 30, 2016
f2c48f0
Rename of subprojects to make the merge easier.
brodecva Aug 1, 2016
f99198b
Merge remote-tracking branch 'remotes/upstream/master' into ziqi-upst…
brodecva Aug 1, 2016
3204bd8
Merge pull request #101 from odalic/ziqi-upstream-merge
brodecva Aug 3, 2016
be730a1
Merge pull request #96 from odalic/feature-primary-kb
brodecva Aug 3, 2016
17f6271
Rename to make the merge easier.
brodecva Aug 3, 2016
2a29a5d
Merge remote-tracking branch 'origin/feature/kbsearchAdjustments' into
brodecva Aug 3, 2016
df21d8c
EOL changes
brodecva Aug 4, 2016
e9bbc2e
Fixed EOLs
brodecva Aug 4, 2016
2b582b2
Re-added files ignored in tmp package.
brodecva Aug 4, 2016
ad0d695
model of annotated table
josef-janousek Aug 4, 2016
1c23f8f
Result to AnnotatedTable adapter
josef-janousek Aug 4, 2016
5c5db98
#53, #91, #104
JanVana Aug 8, 2016
310741f
Merge branch 'master' of https://github.com/odalic/sti into MultipleKB
JanVana Aug 8, 2016
9eeb4b6
Fix of dropping the first annotation members in the merge function.
brodecva Aug 8, 2016
3b39758
serialization of annotated table
josef-janousek Aug 10, 2016
40d84e5
Merge remote-tracking branch 'origin/AnnotatedTable' into develop
brodecva Aug 10, 2016
0325ffa
result to annotated table corrections
josef-janousek Aug 11, 2016
e550382
export result to extended CSV
josef-janousek Aug 11, 2016
da75d48
Merge branch 'develop' of https://github.com/odalic/sti into MultipleKB
JanVana Aug 12, 2016
ce73b72
export corrections
josef-janousek Aug 12, 2016
53910e7
Merge pull request #112 from odalic/CSVExport
brodecva Aug 13, 2016
fede2cd
export to RDF
josef-janousek Aug 14, 2016
8d4a9dc
Addition resulting annotated table and extended CSV to the API.
brodecva Aug 15, 2016
3d74810
Merge pull request #113 from odalic/feature-annotated-table-export-su…
brodecva Aug 15, 2016
8000b4e
#115 - Implementation of multiple caches, one for each KB
JanVana Aug 16, 2016
91a04af
#115 - Configs for multiple caches
JanVana Aug 16, 2016
93f3711
Merge branch 'develop' of https://github.com/odalic/sti into MultipleKB
JanVana Aug 16, 2016
4c43f2f
Merge of develop into MultipleKB
JanVana Aug 16, 2016
3c98291
#115 - global configs
JanVana Aug 16, 2016
8b5ab95
Merge branch 'develop' into RDFExport
tomas-knap Aug 17, 2016
cc67ffd
Converted execution of main method to JUNIT test
tomas-knap Aug 17, 2016
f4df01d
rdf export corrections
josef-janousek Aug 17, 2016
e8ea929
Adjustments to RDF export - simplified creation of triples, warning w…
tomas-knap Aug 18, 2016
2dd2fb0
RDF4J library version update
josef-janousek Aug 18, 2016
a3bc3d4
corrections of rdf export
josef-janousek Aug 18, 2016
e23c504
Merge pull request #116 from odalic/RDFExport
brodecva Aug 18, 2016
9b90128
RDF export added.
brodecva Aug 18, 2016
61debc9
Merge pull request #119 from odalic/feature-rdf-export-api-extension
brodecva Aug 18, 2016
a0b2c69
Merge branch 'develop' of https://github.com/odalic/sti into MultipleKB
JanVana Aug 19, 2016
d415709
#115, #104 - Fix for relative paths in KB configuration
JanVana Aug 19, 2016
0f609c2
#115, #104 - Fix for relative paths in KB configuration
JanVana Aug 19, 2016
6b64e9a
#115, #104 - Fix for relative paths in KB configuration
JanVana Aug 19, 2016
edc10c9
#115, #104 - Fix for relative paths in KB configuration
JanVana Aug 19, 2016
8e2bc5e
Merge pull request #107 from odalic/MultipleKB
brodecva Aug 22, 2016
439ab1a
export tests extensions
josef-janousek Aug 23, 2016
e3bd06b
#121 - handle null pointers
josef-janousek Aug 23, 2016
8bbc36a
export (JSON, CSV, RDF) for multiple KB
josef-janousek Aug 23, 2016
f18ed62
#120 - fix in concept types detection
JanVana Aug 25, 2016
8577ec7
Nulls removing annotations added.
brodecva Aug 25, 2016
80902d3
Merge pull request #125 from odalic/fix-annotated-table-json-from-api…
brodecva Aug 25, 2016
9d8c063
Merge remote-tracking branch 'origin/120_missing_concepts' into develop
brodecva Aug 25, 2016
d88cdf9
Entity candidates order reversed.
brodecva Aug 26, 2016
5410e66
Entity candidate values order fixed so the chosen comes first.
brodecva Aug 26, 2016
f1199eb
Comparison fix.
brodecva Aug 26, 2016
19b8bbf
Merge pull request #127 from odalic/fix-the-order-of-concepts-126
brodecva Aug 26, 2016
e73142b
export corrections (fetching conditions)
josef-janousek Aug 27, 2016
6dbddb4
Merge pull request #128 from odalic/Exports
brodecva Aug 29, 2016
8bcf12c
#133 - Export for multiple KBs - disamb. fix
josef-janousek Sep 1, 2016
1c8292c
#131 - config refactoring
JanVana Sep 2, 2016
a2350a5
New testing batch for just core algorithm.
JanVana Sep 2, 2016
1409504
#132 - Configs with language specification
JanVana Sep 2, 2016
47ec639
#132 - Added support for specifying language
JanVana Sep 2, 2016
80b0c7f
Merge pull request #134 from odalic/export-multiplekb-disamb
brodecva Sep 2, 2016
beaa6c2
Subject column in KBs equality test replaced with primary KB preference.
brodecva Sep 2, 2016
569743a
Unused imports removal.
brodecva Sep 2, 2016
01cfa52
DBPedia to DBpedia fix.
brodecva Sep 2, 2016
31c69bc
Merge pull request #136 from odalic/131_Configs
brodecva Sep 2, 2016
03ec63c
Added proper exception handling #151
tomas-knap Sep 6, 2016
503f03c
JAXB annotations moved to getter where suitable.
brodecva Sep 6, 2016
dfe28ba
JAXB interface handling circumvented.
brodecva Sep 7, 2016
033f13d
Merge pull request #153 from odalic/fix-jaxb-annotation-errors
brodecva Sep 7, 2016
a74d5c6
#135 - Configs modified for bif:contains support
JanVana Sep 12, 2016
8019302
#135 - Proper regex and SPARQL escaping and bif:contains support
JanVana Sep 12, 2016
cd45887
#135 - Fix for bif:contains search
JanVana Sep 12, 2016
7c5c57a
Merge pull request #165 from odalic/135_escaping
brodecva Sep 14, 2016
13b467e
Response message reformation.
brodecva Sep 27, 2016
6a18d23
License added
tomas-knap Sep 30, 2016
4f8b91e
License updated
tomas-knap Sep 30, 2016
eeb6d0d
Feedback cloned to sti-main.
brodecva Oct 2, 2016
62f37bf
Adapting feedback to algorithm constraint.
brodecva Oct 2, 2016
f8c1667
Feedback to constraint adapter added.
brodecva Oct 2, 2016
be17d2c
Merge pull request #185 from odalic/feature-feedback-exchange
brodecva Oct 3, 2016
56975fb
SemanticTableInterpreter - accepting algorithm Constraints
josef-janousek Oct 3, 2016
0a3cf4a
Interpreter factory - refactoring for feedback
josef-janousek Oct 3, 2016
45fd8d0
Feedback - subject column
josef-janousek Oct 3, 2016
247240d
Message extended with builder conversion and optional location.
brodecva Oct 5, 2016
755c306
Message adoption in responses.
brodecva Oct 5, 2016
c121aae
Cell relations removed from the front.
brodecva Oct 6, 2016
95eba20
Removal of cell relations supporting classes in the front.
brodecva Oct 6, 2016
e81c160
Likelihood to Score.
brodecva Oct 6, 2016
f55d604
Subject column per base introduced.
brodecva Oct 6, 2016
2b362b2
Chosen candidates indication reverted to separate container.
brodecva Oct 6, 2016
73fb4f4
Merge branch 'develop' of local repository into feature-rest-overhaul
brodecva Oct 7, 2016
7cbb95c
Subject column per base in feedback.
brodecva Oct 7, 2016
2fd91fd
Additional resources in a message cannot be null.
brodecva Oct 7, 2016
65347b2
Response wrapping.
brodecva Oct 9, 2016
82a82fa
HTTP status serializes to integer code in the response wrapper.
brodecva Oct 9, 2016
2c54567
Response wrapping adoption.
brodecva Oct 9, 2016
7b117bb
State value reverted to the string root element.
brodecva Oct 9, 2016
4d91f92
Custom data JSON conversion classes renaming.
brodecva Oct 10, 2016
692dbad
Annotation parsing fix.
brodecva Oct 10, 2016
71e4059
Primary base API attribute name normalized.
brodecva Oct 10, 2016
b73648d
File API overhaul.
brodecva Oct 13, 2016
dc047b2
States overhaul.
brodecva Oct 13, 2016
6df75a5
Added aggregation of tasks and their state to API.
brodecva Oct 14, 2016
bc583f0
Entities search service and resource added. Implementation needed.
brodecva Oct 14, 2016
b2a8fb9
Exception handling revamped.
brodecva Oct 14, 2016
3467c95
Entities resource name fixed.
brodecva Oct 14, 2016
eee208f
Annotated table returned without a wrap.
brodecva Oct 18, 2016
7863748
No message sent when not acceptable.
brodecva Oct 18, 2016
2f886c0
Relaxation of required attributes in resources.
brodecva Oct 18, 2016
882362f
Merge pull request #191 from odalic/InterpreterFeedback
brodecva Oct 18, 2016
7fed587
Merge branch 'feature-rest-overhaul' into develop
brodecva Oct 18, 2016
4f4d9e6
Feedback - Classification
josef-janousek Oct 24, 2016
e43fff2
Added stable task order to solve #193 .
brodecva Oct 27, 2016
ba36073
Stateful tasks order fix.
brodecva Oct 27, 2016
b8c3a76
Merge pull request #195 from odalic/fix-tasks-order
brodecva Oct 27, 2016
5247276
#189 Fulltext search implementation
JanVana Oct 28, 2016
983500e
Feedback - Disambiguation
josef-janousek Oct 31, 2016
3cd7c1a
Merge pull request #196 from odalic/189
brodecva Nov 2, 2016
fa636ad
NullPointerException when feedback undefined for a base fixed.
brodecva Nov 3, 2016
899fea7
Search path changed to base/entities/search from entities/base/search.
brodecva Nov 6, 2016
b6de249
Search path: base/entities/search?query=... => base/entities?query=...
brodecva Nov 6, 2016
bf5d578
Merge pull request #197 from odalic/fix-entities-resource-paths
brodecva Nov 6, 2016
bddc2c2
Basic proposal API added.
brodecva Nov 7, 2016
fbcd50f
Merge pull request #198 from odalic/feature-proposal-api
brodecva Nov 7, 2016
4f9b828
Merge pull request #192 from odalic/FeedbackClassDisamb
brodecva Nov 10, 2016
17bc9ce
Feedback example
josef-janousek Nov 14, 2016
15b50ae
Feedback - Relations
josef-janousek Nov 14, 2016
0cc4f33
Added alternative export paths when client cannot provide Accept header.
brodecva Nov 14, 2016
2d18159
Merge pull request #201 from odalic/feature-alternative-export-paths
brodecva Nov 14, 2016
26bb8b1
Unused imports cleanup.
brodecva Nov 14, 2016
c0884da
Merge branch 'FeedbackRelations' into develop
brodecva Nov 14, 2016
28e4e32
Double annotation for location in file input fixed.
brodecva Nov 16, 2016
c1e1ced
Adapter annotation fixed.
brodecva Nov 16, 2016
d28e607
#203 - the column is ignored when chosen classification for this colu…
josef-janousek Nov 16, 2016
05b0e8b
#203 - the cell is skipped when chosen disambiguation for this cell i…
josef-janousek Nov 16, 2016
d0e1a49
Merge pull request #204 from odalic/FeedbackEmptyClassDisamb
brodecva Nov 16, 2016
d2fb963
#143 - Configs
JanVana Nov 17, 2016
f4b00bd
#143 - KB search renaming and other changes
JanVana Nov 17, 2016
c68ef9e
#143 - Renaming kbsearch in sti-main
JanVana Nov 17, 2016
73c49d3
#143 - renaming kbsearch in pom
JanVana Nov 17, 2016
c05a9d1
#143 - user defined concepts in odalic module
JanVana Nov 17, 2016
78fa88c
#143 - public IP for DBpedia clone
JanVana Nov 17, 2016
74392d5
Merge from develop
JanVana Nov 17, 2016
92a4def
Added old Aduna repo to the Odalic
JanVana Nov 17, 2016
49f4963
#143 - Changed DBpedia endpoint address
JanVana Nov 17, 2016
533f690
Merge remote-tracking branch 'origin/143' into develop
brodecva Nov 17, 2016
1416d60
Update DBPediaSearch.properties
tomas-knap Nov 17, 2016
54007c3
Interpreter initialization exceptions hiding fixed.
brodecva Nov 18, 2016
ca32ae6
Update DBPediaSearch.properties
tomas-knap Nov 18, 2016
4b95984
#208 - Differentiate classes and concepts proposal
JanVana Nov 21, 2016
70e5cef
Feedback - Ambiguity and ColumnAmbiguity
josef-janousek Nov 23, 2016
6e39a4e
removed extra line
tomas-knap Nov 27, 2016
645a5b0
Merge branch 'develop' of https://github.com/odalic/sti into develop
tomas-knap Nov 27, 2016
f164b8e
#214 - Feedback - check conflicts (ignored column must not be a subje…
josef-janousek Nov 28, 2016
5065a29
Resource type selection (general, classes or properties) support added.
brodecva Nov 30, 2016
551c718
Merge pull request #230 from odalic/feature-resource-type-selection-i…
brodecva Nov 30, 2016
6fdab95
Merge pull request #228 from odalic/FeedbackCheckConflicts
brodecva Dec 1, 2016
4be6531
Merge branch 'develop' of https://github.com/odalic/sti into 208
JanVana Dec 1, 2016
6b37393
#208 - renamed config properties
JanVana Dec 1, 2016
14ea417
Merge pull request #223 from odalic/FeedbackAmbiguities
brodecva Dec 2, 2016
5f5de97
Merge pull request #220 from odalic/208
brodecva Dec 2, 2016
7937bb7
#159 - Added config KB class setting
JanVana Dec 4, 2016
912d86f
#159 - Added KB class setting to the KBProxy
JanVana Dec 4, 2016
d8ae807
Merge branch 'develop' of https://github.com/odalic/sti into 159
JanVana Dec 4, 2016
1d6a52a
Model extended with property proposal.
brodecva Dec 5, 2016
98193ae
#231 - export corrections (skip empty values)
josef-janousek Dec 7, 2016
3b208b9
Property proposal addition finished.
brodecva Dec 8, 2016
1f56a80
Dummy created proposed property added.
brodecva Dec 8, 2016
b90a85f
Merge pull request #235 from odalic/feature-relation-proposal-api-170
brodecva Dec 8, 2016
89580d1
Logging of mapped throwable added.
brodecva Dec 8, 2016
4f0bbf1
Merge pull request #236 from odalic/fix-throwable-mapper-logging-added
brodecva Dec 8, 2016
f9703ec
#231 - export corrections (no empty strings in csv export)
josef-janousek Dec 8, 2016
68dd0e2
Client request stamps support added.
brodecva Dec 9, 2016
98aff09
Merge pull request #239 from odalic/feature-client-request-stamps
brodecva Dec 9, 2016
b81c18f
Logback config warning eliminated.
brodecva Dec 9, 2016
297f189
Stamp extraction method documentation fixed.
brodecva Dec 9, 2016
2e2e531
Merge pull request #234 from odalic/231_ExportCorrections
brodecva Dec 9, 2016
dbe1911
Merge branch 'develop' of https://github.com/odalic/sti into 159
JanVana Dec 12, 2016
ae950b0
#169 - CSV file consistency check
josef-janousek Dec 12, 2016
0b6a592
#159 - Switch from string queries to SelectBuilder
JanVana Dec 13, 2016
a94d0af
#159 - Switch from string queries to SelectBuilder
JanVana Dec 13, 2016
f45dbf4
#159 - Switch from string queries to SelectBuilder
JanVana Dec 13, 2016
ebfdcf2
#159 - SPARQL refactoring and class restrictions
JanVana Dec 13, 2016
c1cb90e
Merge pull request #241 from odalic/CsvConsistencyCheck
brodecva Dec 13, 2016
9c029a2
Merge pull request #244 from odalic/159
brodecva Dec 13, 2016
be93fbf
Bases API added.
brodecva Dec 14, 2016
9cd35c4
Services wiring fixed.
brodecva Dec 14, 2016
2f2065f
Maven compiler plugin version removed (it was breaking Travis builds).
brodecva Dec 14, 2016
a531cf4
Travis breaking Maven compile plugin version setting removed.
brodecva Dec 14, 2016
56b8fef
Merge pull request #246 from odalic/feature-224-kbs-api
brodecva Dec 14, 2016
e0d21e3
Version 5 Bing API implemented.
brodecva Dec 15, 2016
5d42d55
Comment about left out Bing version 2 web page ID added.
brodecva Dec 15, 2016
754acdb
Config changed to accomodate version 5 Bing search API.
brodecva Dec 15, 2016
61cecb4
Author name typo fixed.
brodecva Dec 15, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
55 changes: 40 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,17 +1,42 @@
# Auto detect text files and perform LF normalization
* text=auto
# Perform EOL normalization when needed
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
Cakefile text eol=lf
LICENCE text eol=lf
LICENSE text eol=lf
LICENSE-MIT text eol=lf
Makefile text eol=lf
*.coffee text eol=lf
*.css text eol=lf
*.eslintignore text eol=lf
*.eslintrc text eol=lf
*.gitattributes text eol=lf
*.gitignore text eol=lf
*.gitmodules text eol=lf
*.html text eol=lf
*.info text eol=lf
*.jamignore text eol=lf
*.java text eol=lf
*.js text eol=lf
*.jshintrc text eol=lf
*.json text eol=lf
*.js text eol=lf
*.md text eol=lf
*.md~ text eol=lf
*.npmignore text eol=lf
*.properties text eol=lf
*.py text eol=lf
*.sh text eol=lf
*.txt text eol=lf
*.watchr text eol=lf
*.xml text eol=lf
*.yml text eol=lf

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.bat text eol=crlf

*.bin binary
*.gif binary
*.jar binary
*.jpg binary
*.png binary
*.zip binary
71 changes: 68 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# =========================
# Operating System Files
# =========================

ui/tmp
ui/output

# Windows image file caches
Thumbs.db
ehthumbs.db
Expand All @@ -20,9 +25,6 @@ $RECYCLE.BIN/
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

Expand Down Expand Up @@ -63,6 +65,69 @@ cache/empty/relation/data/*
cache/empty/websearch/data/*
cache/empty/similarity/data/*
delete/*

# =========================
# Eclipse files
# =========================

.metadata
bin/
/tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# =========================
# IntelliJ IDEA
# =========================

*.iml
*/.idea
.Idea/*
out/*
classes/*
/ui/nbproject/private/
Expand Down
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

88 changes: 0 additions & 88 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/encodings.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__asm_asm_3_1.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__cc_mallet_mallet_2_0_7_RC2.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__colt_colt_1_2_0.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_beust_jcommander_1_23.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/libraries/Maven__com_carrotsearch_hppc_0_7_1.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading