-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '0c493260c649ad35f02377f82f25e9ef48c5c405' into feature/…
…1531-PDF-recommendation-color-is-really-difficult-to-read * commit '0c493260c649ad35f02377f82f25e9ef48c5c405': (453 commits) No issue. Fix version reference. #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1870 - Improve roundtrip times on annotation page #1868 - Deadlock importing project with large tagset on HSQLDB #1860 - Layers without features are not indexed for search No issue: Adjust to upstream API change. No issue: Fix problem that prepended item is rendered on different row than rest of group (hopefully) No issue: Fix warnings when building documentation #1859 - Upgrade dependencies #1852 - Default ElasticSearch document repository settings do not work #1830 - Upgrade to Wicket 9 #1848 - Documentation-improvements #1830 - Upgrade to Wicket 9 #1830 - Upgrade to Wicket 9 #1830 - Upgrade to Wicket 9 ...
- Loading branch information
Showing
652 changed files
with
55,055 additions
and
6,375 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,4 @@ target | |
| cache | ||
| idea/ | ||
| .factorypath | ||
| *.jfr | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| language: java |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
.../de/tudarmstadt/ukp/inception/active/learning/config/ActiveLearningAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright 2020 | ||
| * Ubiquitous Knowledge Processing (UKP) Lab | ||
| * Technische Universität Darmstadt | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package de.tudarmstadt.ukp.inception.active.learning.config; | ||
|
|
||
| import org.springframework.boot.autoconfigure.AutoConfigureAfter; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService; | ||
| import de.tudarmstadt.ukp.clarin.webanno.security.UserDao; | ||
| import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningService; | ||
| import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningServiceImpl; | ||
| import de.tudarmstadt.ukp.inception.active.learning.log.ActiveLearningRecommendationEventAdapter; | ||
| import de.tudarmstadt.ukp.inception.active.learning.log.ActiveLearningSuggestionOfferedAdapter; | ||
| import de.tudarmstadt.ukp.inception.active.learning.sidebar.ActiveLearningSidebarFactory; | ||
| import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService; | ||
| import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService; | ||
| import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration; | ||
|
|
||
| @Configuration | ||
| @AutoConfigureAfter(RecommenderServiceAutoConfiguration.class) | ||
| @ConditionalOnBean(RecommendationService.class) | ||
| @ConditionalOnProperty( | ||
| prefix = "recommender.active-learning", | ||
| name = "enabled", | ||
| havingValue = "true", | ||
| matchIfMissing = true) | ||
| public class ActiveLearningAutoConfiguration | ||
| { | ||
| @Bean | ||
| public ActiveLearningService activeLearningService(DocumentService aDocumentService, | ||
| RecommendationService aRecommendationService, UserDao aUserDao, | ||
| LearningRecordService aLearningHistoryService) | ||
| { | ||
| return new ActiveLearningServiceImpl(aDocumentService, aRecommendationService, aUserDao, | ||
| aLearningHistoryService); | ||
| } | ||
|
|
||
| @Bean | ||
| public ActiveLearningRecommendationEventAdapter activeLearningRecommendationEventAdapter() | ||
| { | ||
| return new ActiveLearningRecommendationEventAdapter(); | ||
| } | ||
|
|
||
| @Bean | ||
| public ActiveLearningSuggestionOfferedAdapter activeLearningSuggestionOfferedAdapter() | ||
| { | ||
| return new ActiveLearningSuggestionOfferedAdapter(); | ||
| } | ||
|
|
||
| @Bean | ||
| public ActiveLearningSidebarFactory activeLearningSidebarFactory() | ||
| { | ||
| return new ActiveLearningSidebarFactory(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.