Skip to content

Commit 5e92bc1

Browse files
committed
Rearranging the members in Session.Result.
1 parent 1035b1d commit 5e92bc1

File tree

1 file changed

+36
-37
lines changed
  • tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow

1 file changed

+36
-37
lines changed

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Session.java

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -712,43 +712,6 @@ public void restore(String prefix) {
712712
* IllegalStateException} upon access.
713713
*/
714714
public static final class Result implements AutoCloseable, Iterable<Map.Entry<String, Tensor>> {
715-
716-
private static final Logger logger = Logger.getLogger(Result.class.getName());
717-
718-
private final Map<String, Tensor> map;
719-
720-
private final List<Tensor> list;
721-
722-
private final RunMetadata metadata;
723-
724-
private boolean closed;
725-
726-
/**
727-
* Creates a Result from the names and values produced by {@link Session.Runner#run()}.
728-
*
729-
* @param names The output names.
730-
* @param values The output values.
731-
* @param metadata The run metadata, may be null.
732-
*/
733-
Result(List<String> names, List<Tensor> values, RunMetadata metadata) {
734-
this.map = new LinkedHashMap<>();
735-
this.list = new ArrayList<>(values);
736-
737-
if (names.size() != values.size()) {
738-
throw new IllegalArgumentException(
739-
"Expected same number of names and values, found names.length = "
740-
+ names.size()
741-
+ ", values.length = "
742-
+ values.size());
743-
}
744-
745-
for (int i = 0; i < names.size(); i++) {
746-
this.map.put(names.get(i), values.get(i));
747-
}
748-
this.metadata = metadata;
749-
this.closed = false;
750-
}
751-
752715
@Override
753716
public void close() {
754717
if (!closed) {
@@ -827,6 +790,42 @@ public Optional<Tensor> get(String key) {
827790
public Optional<RunMetadata> getMetadata() {
828791
return Optional.ofNullable(metadata);
829792
}
793+
794+
/**
795+
* Creates a Result from the names and values produced by {@link Session.Runner#run()}.
796+
*
797+
* @param names The output names.
798+
* @param values The output values.
799+
* @param metadata The run metadata, may be null.
800+
*/
801+
Result(List<String> names, List<Tensor> values, RunMetadata metadata) {
802+
this.map = new LinkedHashMap<>();
803+
this.list = new ArrayList<>(values);
804+
805+
if (names.size() != values.size()) {
806+
throw new IllegalArgumentException(
807+
"Expected same number of names and values, found names.length = "
808+
+ names.size()
809+
+ ", values.length = "
810+
+ values.size());
811+
}
812+
813+
for (int i = 0; i < names.size(); i++) {
814+
this.map.put(names.get(i), values.get(i));
815+
}
816+
this.metadata = metadata;
817+
this.closed = false;
818+
}
819+
820+
private final Map<String, Tensor> map;
821+
822+
private final List<Tensor> list;
823+
824+
private final RunMetadata metadata;
825+
826+
private boolean closed;
827+
828+
private static final Logger logger = Logger.getLogger(Result.class.getName());
830829
}
831830

832831
Graph graph() {

0 commit comments

Comments
 (0)