Commits

Panagiotis Mavrogiorgos  committed 20dd0d2

Added calls to the initialize method at the recycling methods.

  • Participants
  • Parent commits fd87670

Comments (0)

Files changed (1)

File pull_out_tests.py

                 self.es[i], self.Ss[i])
 
     def run_recycling_positive(self, P, times):
-
         # reset the database before running tests
         # TODO needs testing!!!
         self.initialize()
         self.store_laws_and_Specimen(self.db)
 
     def run_recycling_negative(self, P, times):
+        # reset the database before running tests
+        # TODO needs testing!!!
+        self.initialize()
 
         self.define_monotonic_laws(-1)
         self.push_load(0)
         self.store_laws_and_Specimen(self.db)
 
     def run_repeating_positive(self, P, times):
+        # reset the database before running tests
+        # TODO needs testing!!!
+        self.initialize()
 
         self.define_monotonic_laws(1)
         self.pull_load(0)
         1
 
     def run_recycling_negative(self, P, times):
+        # reset the database before running tests
+        # TODO needs testing!!!
+        self.initialize()
 
         self.define_monotonic_laws(-1)
         self.push_load(0)
         self.s = s
         self.DSs = DSs
 
-    def run(self, P):
+    def run_recycling_positive(self, P, times):
+        # reset the database before running tests
+        # TODO needs testing!!!
+        self.initialize()
 
         self.define_monotonic_laws(1)
         self._calc_external_stresses(0, self.Lext)
         self.pull_load(0)
         self.store_laws_and_Specimen(self.db)
 
-        self._calc_external_stresses(P, self.Lext)
-        self.pull_load(P)
-        self.store_laws_and_Specimen(self.db)
-
-        1
-
-    def run_recycling_positive(self, P, times):
-
-        self.define_monotonic_laws(1)
-        self._calc_external_stresses(0, self.Lext)
-        self.pull_load(0)
-        self.store_laws_and_Specimen(self.db)
-
-        for i in range(times):
+        for i in range(times // 5):
             self._calc_external_stresses(P, self.Lext)
             self.pull_load(P)
             self.store_laws_and_Specimen(self.db)