Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSCore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
VIPSCore
Commits
e1135c79
Commit
e1135c79
authored
1 year ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Update deps to VIPSCommon and models
parent
17babb2c
No related branches found
No related tags found
No related merge requests found
Pipeline
#2674
passed
1 year ago
Stage: build
Stage: test
Stage: deploy
Stage: upload
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
models.xml
+22
-22
22 additions, 22 deletions
models.xml
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+1
-0
1 addition, 0 deletions
...in/java/no/nibio/vips/core/service/ModelResourceImpl.java
with
24 additions
and
23 deletions
models.xml
+
22
−
22
View file @
e1135c79
...
...
@@ -2,111 +2,111 @@
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
AlternariaModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
4
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
AppleScabModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
BarleyNetBlotchModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
BremiaLactucaeModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
DeliaRadicumModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
DeliaRadicumFloralisObservationModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
DOWNCASTModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
fi.luke.vips.model
</groupId>
<artifactId>
FinnCerealModels
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
GrassDryingModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
LygusRugulipennisModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
MamestraBrassicaeModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
Model_LEAFBLOTCH
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
Model_MAIZEPHENO
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
NaerstadModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
NegativePrognosisModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
OatFloweringModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
PsilaRosaeObservationModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
PsilaRosaeTempModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
RoughageNutritionModel
</artifactId>
<version>
1.1.
4
</version>
<version>
1.1.
5
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
SeptoriaApiicolaModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
SeptoriaHumidityModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
<dependency>
<groupId>
no.nibio.vips.model
</groupId>
<artifactId>
SeptoriaReferenceHumidityModel
</artifactId>
<version>
1.1.
1
</version>
<version>
1.1.
3
</version>
</dependency>
</dependencies>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
e1135c79
...
...
@@ -66,7 +66,7 @@
<dependency>
<groupId>
no.nibio.vips
</groupId>
<artifactId>
VIPSCommon
</artifactId>
<version>
2.0.
1
</version>
<version>
2.0.
2
</version>
</dependency>
<dependency>
<groupId>
javax
</groupId>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+
1
−
0
View file @
e1135c79
...
...
@@ -341,6 +341,7 @@ public class ModelResourceImpl implements ModelResource{
Model
calledModel
=
ModelFactory
.
getInstance
().
getModelInstance
(
modelId
);
calledModel
.
setConfiguration
(
config
);
List
<
Result
>
results
=
calledModel
.
getResult
();
//results.forEach(x->System.out.println(x.toString()));
return
Response
.
ok
().
entity
(
dt
.
getIPMDecisionsModelOutput
(
results
)).
build
();
}
catch
(
Exception
ex
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment