Merge pull request #87 from c-bata/fix-trial-number

Fix trial number on RDB storage
c-bata · Mar 11, 2020 · 5bad401 · 5bad401
2 parents 59b071f + 4a06fc7
commit 5bad401
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/rdb/storage.go b/rdb/storage.go
@@ -227,6 +227,7 @@ func (s *Storage) CreateNewTrial(studyID int) (int, error) {
 	var number int
 	err := tx.Model(&trialModel{}).
 		Where("study_id = ?", studyID).
+		Where("trial_id < ?", trial.ID).
 		Count(&number).Error
 	if err != nil {
 		tx.Rollback()

diff --git a/rdb/storage_test.go b/rdb/storage_test.go
@@ -541,7 +541,7 @@ func TestStorage_GetBestTrial(t *testing.T) {
 		t.Errorf("error: %v != nil", err)
 		return
 	}
-	// trial number 1 (not completed yet)
+	// trial number 0 (not completed yet)
 	trialID, err := storage.CreateNewTrial(studyID)
 	if err != nil {
 		t.Errorf("error: %v != nil", err)
@@ -553,7 +553,7 @@ func TestStorage_GetBestTrial(t *testing.T) {
 		return
 	}
 
-	// trial number 2
+	// trial number 1
 	trialID, err = storage.CreateNewTrial(studyID)
 	if err != nil {
 		t.Errorf("error: %v != nil", err)
@@ -570,7 +570,7 @@ func TestStorage_GetBestTrial(t *testing.T) {
 		return
 	}
 
-	// trial number 3
+	// trial number 2
 	trialID, err = storage.CreateNewTrial(studyID)
 	if err != nil {
 		t.Errorf("error: %v != nil", err)
@@ -592,8 +592,8 @@ func TestStorage_GetBestTrial(t *testing.T) {
 		t.Errorf("error: %v != nil", err)
 		return
 	}
-	if bestTrial.Value == 0.2 && bestTrial.Number != 3 {
-		t.Errorf("want Trial(Value=0.2, Number: 3), but got %#v", bestTrial)
+	if bestTrial.Value == 0.2 && bestTrial.Number != 2 {
+		t.Errorf("want Trial(Value=0.2, Number: 2), but got %#v", bestTrial)
 	}
 }