Merge branch 'develop'

39ac0c4d · remi cresson · dadfc47f · f18f4184 · 39ac0c4d · 39ac0c4d
Commit 39ac0c4d authored Nov 05, 2018 by remi cresson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

LICENSE LICENSE +1 -1

include/otbTensorflowMultisourceModelLearningBase.hxx include/otbTensorflowMultisourceModelLearningBase.hxx +1 -1

No files found.
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2018] [Rémi Cresson (IRSTEA)]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

--- a/include/otbTensorflowMultisourceModelLearningBase.hxx
+++ b/include/otbTensorflowMultisourceModelLearningBase.hxx
@@ -138,7 +138,7 @@ TensorflowMultisourceModelLearningBase<TInputImage>
    // Batch start and size
    const IndexValueType sampleStart = batch * m_BatchSize;
    IndexValueType batchSize = m_BatchSize;
-    if (rest != 0)
+    if (rest != 0 && batch == nBatches - 1)
    {
      batchSize = rest;
    }