Skip to content

Commit 96b34c4

Browse files
author
Javier Alperte
committed
Fix bug in the constructor of the LocalEnsemble
1 parent 5c54fcf commit 96b34c4

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

src/main/java/org/bigml/binding/LocalEnsemble.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class LocalEnsemble {
6060

6161
public LocalEnsemble(JSONObject ensemble, String storage, Integer max)
6262
throws Exception {
63-
this(ensemble);
63+
this(ensemble, max);
6464
}
6565

6666
/**
@@ -74,11 +74,16 @@ public LocalEnsemble(JSONObject ensemble) throws Exception {
7474
if (ensemble.get("objects") != null) {
7575
throw new IllegalArgumentException("Embedded objects unsupported");
7676
} else {
77-
this.ensembleId = (String) ensemble.get("resource");
77+
String prefix = Utils.getJSONObject(ensemble, "object") != null ? "object."
78+
: "";
79+
80+
this.ensembleId = (String) Utils.getJSONObject(ensemble,
81+
prefix + "resource");
82+
7883
JSONArray modelsJson = (JSONArray) Utils.getJSONObject(ensemble,
79-
"models");
84+
prefix + "models");
8085
distribution = (JSONArray) Utils.getJSONObject(ensemble,
81-
"distributions");
86+
prefix + "distributions");
8287

8388

8489
int mn = modelsJson.size();
@@ -112,11 +117,15 @@ public LocalEnsemble(JSONObject ensemble, Integer maxModels) throws Exception {
112117
if (ensemble.get("objects") != null) {
113118
throw new IllegalArgumentException("Embedded objects unsupported");
114119
} else {
115-
this.ensembleId = (String) ensemble.get("resource");
120+
String prefix = Utils.getJSONObject(ensemble, "object") != null ? "object."
121+
: "";
122+
123+
this.ensembleId = (String) Utils.getJSONObject(ensemble,
124+
prefix + "resource");
116125
JSONArray modelsJson = (JSONArray) Utils.getJSONObject(ensemble,
117-
"models");
126+
prefix + "models");
118127
distribution = (JSONArray) Utils.getJSONObject(ensemble,
119-
"distributions");
128+
prefix + "distributions");
120129

121130
int mn = modelsJson.size();
122131
modelsIds = new String[mn];

0 commit comments

Comments
 (0)