Skip to content

Commit

Permalink
Merge pull request #148 from GBillotey/fixup_test
Browse files Browse the repository at this point in the history 
Fixing tests
  • Loading branch information
@GBillotey
GBillotey committed Aug 2, 2023
2 parents 95de262 + 7d6606c commit 343d58b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 129 deletions.
101 changes: 22 additions & 79 deletions tests/test_exp_db.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@






# Defines the plotting function

# Defines the plotting function "Green mini"
def get_plotter(
fractal: fs.Fractal= None,
calc_name: str="std_zooming_calc",
Expand Down Expand Up @@ -410,36 +406,6 @@ def get_plotter(
return plotter, plotter[base_layer].postname
































class Test_exp_db(unittest.TestCase):

@classmethod
Expand Down Expand Up @@ -579,50 +545,39 @@ def setUpClass(cls):



# @test_config.no_stdout
@test_config.no_stdout
def test_green(self):
""" Testing basic `Color_layer` plots from a saved database
Note: matrix test with supersampling & modifier to account for diff
code paths
"""
def plotter_modifier(plotter, time):
""" --- A modifier that does nothing --- """
pass

final_nx = 1280
xy_ratio = 1280. / 720. # / 480.
final_nx = 720
xy_ratio = 720. / 480. # / 480.
h = np.log(12.) # database zoom span
frame_h = np.log(2.) # Actual plot zoom level
nt = 4 * final_nx # equal to the number of pixels along a square
nt = 3 * final_nx # equal to the number of pixels along a square
nh = int(nt / (2 * np.pi) * h + 0.5)

for (ss, mod) in (
(None, None),
# (None, plotter_modifier),
# ('3x3', None),
# ('3x3', plotter_modifier),
):
with self.subTest(supersampling=ss, plotting_modifier=mod):
for ss in (None, '3x3'):
with self.subTest(supersampling=ss):

plot_kwargs = self.get_plot_kwargs()
plot_kwargs["supersampling"] = ss

# Write the expmap database
proj = fs.projection.Expmap(hmin=0., hmax=h, rotates_df=False)
proj = fs.projection.Expmap(hmin=0., hmax=h, rotates_df=False,
orientation="vertical")
plot_kwargs["recovery_mode"] = True
plot_kwargs["nx"] = nh
plot_kwargs["batch_params"] = {"projection": proj}
plotter, layer_name = get_plotter(**plot_kwargs)

if mod is None:
# Saving the rgb image as *.postdb
expdb_path = plotter.save_db(
"expmap.postdb",
postdb_layer = layer_name,
exp_zoom_step = (4 * nt)
)
else:
expdb_path = plotter.save_db("expmap.db", exp_zoom_step=4*nt)
# Saving the rgb image as *.postdb
expdb_path = plotter.save_db(
"expmap.postdb",
postdb_layer = layer_name,
)

# Write the final database
proj = fs.projection.Cartesian()
Expand All @@ -632,42 +587,30 @@ def plotter_modifier(plotter, time):
plot_kwargs["xy_ratio"] = 1.0
plot_kwargs["batch_params"] = {"projection": proj}
plotter, layer_name = get_plotter(**plot_kwargs)

if mod is None:
# Saving the rgb image as *.postdb
finaldb_path = plotter.save_db(
"final.postdb", postdb_layer=layer_name
)
else:
finaldb_path = plotter.save_db("final.db")


# Saving the rgb image as *.postdb
finaldb_path = plotter.save_db(
"final.postdb", postdb_layer=layer_name
)

# Wrap data in a Expmap database object
wraper_db = fs.db.Exp_db(expdb_path, finaldb_path)

if mod is not None:
wraper_db.set_plotter(
plotter, layer_name, plotting_modifier=mod
)

# Plot a Frame
h = np.log(4.)
test_frame = fs.db.Exp_frame(
h=frame_h,
nx=final_nx,
xy_ratio=xy_ratio,
# pts=self.pts
)
img = wraper_db.plot(test_frame)

mod_str = "postdb" if mod is None else "modified"
mod_str = "postdb"
out_file = os.path.join(
self.db_dir,
f"test_db_color_basic_{mod_str}_{ss}.png")
img.save(out_file)

# ref_file = os.path.join(
# self.dir_ref, f"Color_layer_cont_iter.REF.png")
# self.check_image(ref_file, out_file)



def check_image(self, ref_file_path, test_file_path, err_max=0.01):
Expand Down
49 changes: 0 additions & 49 deletions tests/test_filters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,55 +286,6 @@ def check_image(self, ref_file_path, test_file_path, err_max=0.01):



def test_final_77(self):
""" test of the final image of a zoom with 7x7 supersampling
"""
dir_77 = os.path.join(self.filter_dir, "7x7")
fs.utils.mkdir_p(dir_77)
import fractalshades.db
from green_mini import get_plotter, plot_kwargs

# "Standard" plotting
plot_kwargs["fractal"] = (
fractalshades.models.mandelbrot_M2.Perturbation_mandelbrot(
directory=dir_77
)
)
plot_kwargs["has_shading"] = False

for s in fs.core.SUPERSAMPLING_DIC.keys():
s = 'None'
plot_kwargs["supersampling"] = s
plotter, layer_name = get_plotter(**plot_kwargs)
plotter.plot()
break
# f = plotter.fractal

# print(f._calc_data['std_zooming_calc'].keys())
# print(f._calc_data['std_zooming_calc']['calc_kwargs'])
# print(f._calc_data['std_zooming_calc']['zoom_kwargs'])
# print(
# ((f._calc_data['std_zooming_calc']['state']).__dict__).keys()
# )#["init_kwargs"]) #['init_kwargs']) #['directory'])
# raise

# f.directory = dir_77


# "db" plotting
finaldb_path = plotter.save_db("final.db")
finaldb = fs.db.Db(finaldb_path)
finaldb.set_plotter(plotter, layer_name)
img = finaldb.plot()
img.save(os.path.join(
os.path.dirname(finaldb.path),
"final_full2.png"
))
print("finaldb.path", finaldb.path)







Expand Down
2 changes: 1 addition & 1 deletion tests/test_perturbation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ def test_ultradeep_interior_detect(self):

self.layer = plotter[layer_name]
self.test_name = test_name
self.check_current_layer(0.01)
self.check_current_layer(0.1)


def calc(self, x, y, dx, precision, nx, test_name, calc_name,
Expand Down

0 comments on commit 343d58b

Please sign in to comment.