Browse code

3.99.4: fixing failing test.Z-interventions on Mac

ramon diaz-uriarte (at Phelsuma) authored on 04/07/2022 21:06:23
Showing3 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: OncoSimulR
2 2
 Type: Package
3 3
 Title: Forward Genetic Simulation of Cancer Progression with Epistasis 
4
-Version: 3.99.3
5
-Date: 2022-06-30
4
+Version: 3.99.4
5
+Date: 2022-07-04
6 6
 Authors@R: c(
7 7
 	      person("Ramon", "Diaz-Uriarte", role = c("aut", "cre"),	
8 8
  	   		     email = "rdiaz02@gmail.com"),
... ...
@@ -1,3 +1,7 @@
1
+Changes in version 3.99.4 (2022-07-04):
2
+	- Failing a test in test.Z-intervention.R in Mac OS; did not fix
3
+	correctly previous time.
4
+
1 5
 Changes in version 3.99.3 (2022-06-30):
2 6
 	- Failing a test in test.Z-intervention.R in Mac OS
3 7
 	
... ...
@@ -131,22 +131,23 @@ test_that("2. Drastically reducing a high-fitness genotype population (Exp) | Tr
131 131
             i <- i + 1
132 132
         }
133 133
         testthat::expect_equal(flag, FALSE)
134
-    }
134
+    
135 135
 
136
-    # then, between the time intervals, T >= 80 and T<=85
137
-    # we control that the B population
138
-    flag <- FALSE
139
-    i <- 80002
140
-    while(i <= 85000){
141
-        if(ep2$pops.by.time[i, 3:3] > 40){
142
-            flag <- TRUE
136
+        ## then, between the time intervals, T >= 80 and T<=85
137
+        ## we control that the B population
138
+        flag <- FALSE
139
+        i <- 80002
140
+        while(i <= 85000){
141
+            if(ep2$pops.by.time[i, 3:3] > 40){
142
+                flag <- TRUE
143
+            }
144
+            i <- i + 1
143 145
         }
144
-        i <- i + 1
145
-    }
146 146
 
147
-    testthat::expect_equal(flag, FALSE)
148
-    # we plot the simulation when no interventions are specified.
149
-    #plot(ep2, show = "genotypes", type = "line")
147
+        testthat::expect_equal(flag, FALSE)
148
+        ## we plot the simulation when no interventions are specified.
149
+        ## plot(ep2, show = "genotypes", type = "line")
150
+    }
150 151
 })
151 152
 
152 153
 cat(paste("\n Ending interventions tests", date(), "\n"))