diff --git a/images/gallery/mandelbrot_MANDELBROT_63_SATELITE_REGION_04.jpg b/images/gallery/mandelbrot_MANDELBROT_63_SATELITE_REGION_04.jpg new file mode 100644 index 0000000..37f589f Binary files /dev/null and b/images/gallery/mandelbrot_MANDELBROT_63_SATELITE_REGION_04.jpg differ diff --git a/images/gallery/mandelbrot_MANDELBROT_70_DOUADY_RABBIT_03.jpg b/images/gallery/mandelbrot_MANDELBROT_72_DOUADY_RABBIT_03.jpg similarity index 100% rename from images/gallery/mandelbrot_MANDELBROT_70_DOUADY_RABBIT_03.jpg rename to images/gallery/mandelbrot_MANDELBROT_72_DOUADY_RABBIT_03.jpg diff --git a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_40_SEAHORSE_DIVE_01.h b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_40_SEAHORSE_DIVE_01.h index 162c1db..cf8c078 100644 --- a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_40_SEAHORSE_DIVE_01.h +++ b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_40_SEAHORSE_DIVE_01.h @@ -10,8 +10,8 @@ constexpr char MANDELBROT_FILENAME_STRING[] = "MANDELBROT_40_SEAHORSE_DIVE_01"; - constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 34; - constexpr int MANDELBROT_ITERATION_DIGITS10 = 34; + constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 37; + constexpr int MANDELBROT_ITERATION_DIGITS10 = 37; constexpr int MANDELBROT_CALCULATION_PIXELS_X = 2048; constexpr int MANDELBROT_CALCULATION_PIXELS_Y = 2048; constexpr int MANDELBROT_CALCULATION_ITERATIONS = 10000; diff --git a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_63_SATELITE_REGION_04.h b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_63_SATELITE_REGION_04.h new file mode 100644 index 0000000..1f5616e --- /dev/null +++ b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_63_SATELITE_REGION_04.h @@ -0,0 +1,32 @@ +/////////////////////////////////////////////////////////////////////////////// +// Copyright Christopher Kormanyos 2024. +// Distributed under the Boost Software License, +// Version 1.0. (See accompanying file LICENSE_1_0.txt +// or copy at http://www.boost.org/LICENSE_1_0.txt) +// + +#ifndef MANDELBROT_CFG_MANDELBROT_63_SATELITE_REGION_04_2024_09_30_H + #define MANDELBROT_CFG_MANDELBROT_63_SATELITE_REGION_04_2024_09_30_H + + // This is a specialized configuration file intended to be used for simply + // trying out deep dives, such as those found by MandelbrotDiscovery + // or found by other methods. + + constexpr char MANDELBROT_FILENAME_STRING[] = "MANDELBROT_63_SATELITE_REGION_04"; + + constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 214; + constexpr int MANDELBROT_ITERATION_DIGITS10 = 24; + constexpr int MANDELBROT_CALCULATION_PIXELS_X = 2048; + constexpr int MANDELBROT_CALCULATION_PIXELS_Y = 2048; + constexpr int MANDELBROT_CALCULATION_ITERATIONS = 14000; + + constexpr char MANDELBROT_POINT_DX_HALF[] = "8.0E-190"; + constexpr char MANDELBROT_POINT_DY_HALF[] = "8.0E-190"; + constexpr char MANDELBROT_POINT_CENTER_X[] = "-1.8699746396068234286692870030368768342037915453642718845509028250103459986994857328215914371327608244573050112378162372813745137414275903616640983656639053254827407629999158221608411935399712125613169306975303341796875"; + constexpr char MANDELBROT_POINT_CENTER_Y[] = "+0.0014397083058718932815517159691261764084009958345476625415401283362782412191970631987534414177842258005688394204420205338263522643408260217088410151729628883966663578850294616803557413620305357059671210545313455078125"; + + #define MANDELBROT_GENERATOR_TYPE mandelbrot_generator_perturbative // NOLINT(cppcoreguidelines-macro-usage) + + #include + +#endif // MANDELBROT_CFG_MANDELBROT_63_SATELITE_REGION_04_2024_09_30_H diff --git a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_70_DOUADY_RABBIT_03.h b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_72_DOUADY_RABBIT_03.h similarity index 79% rename from mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_70_DOUADY_RABBIT_03.h rename to mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_72_DOUADY_RABBIT_03.h index de597c6..d8c339a 100644 --- a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_70_DOUADY_RABBIT_03.h +++ b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_72_DOUADY_RABBIT_03.h @@ -5,13 +5,13 @@ // http://www.boost.org/LICENSE_1_0.txt) // -#ifndef MANDELBROT_CFG_MANDELBROT_70_DOUADY_RABBIT_03_2024_04_07_H - #define MANDELBROT_CFG_MANDELBROT_70_DOUADY_RABBIT_03_2024_04_07_H +#ifndef MANDELBROT_CFG_MANDELBROT_72_DOUADY_RABBIT_03_2024_04_07_H + #define MANDELBROT_CFG_MANDELBROT_72_DOUADY_RABBIT_03_2024_04_07_H - constexpr char MANDELBROT_FILENAME_STRING[] = "MANDELBROT_70_DOUADY_RABBIT_03"; + constexpr char MANDELBROT_FILENAME_STRING[] = "MANDELBROT_72_DOUADY_RABBIT_03"; - constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 54; - constexpr int MANDELBROT_ITERATION_DIGITS10 = 54; + constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 51; + constexpr int MANDELBROT_ITERATION_DIGITS10 = 51; constexpr int MANDELBROT_CALCULATION_PIXELS_X = 2048; constexpr int MANDELBROT_CALCULATION_PIXELS_Y = 2048; constexpr int MANDELBROT_CALCULATION_ITERATIONS = 100000; @@ -33,4 +33,4 @@ #include -#endif // MANDELBROT_CFG_MANDELBROT_70_DOUADY_RABBIT_03_2024_04_07_H +#endif // MANDELBROT_CFG_MANDELBROT_72_DOUADY_RABBIT_03_2024_04_07_H diff --git a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_99_TRY_POINTS.h b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_99_TRY_POINTS.h index 896dbae..3f25856 100644 --- a/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_99_TRY_POINTS.h +++ b/mandelbrot/cfg/mandelbrot_cfg_MANDELBROT_99_TRY_POINTS.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Copyright Christopher Kormanyos 22022 - 024. +// Copyright Christopher Kormanyos 2022 - 2024. // Distributed under the Boost Software License, // Version 1.0. (See accompanying file LICENSE_1_0.txt // or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -14,31 +14,18 @@ constexpr char MANDELBROT_FILENAME_STRING[] = "MANDELBROT_99_TRY_POINTS"; - constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 58; - constexpr int MANDELBROT_ITERATION_DIGITS10 = 58; + constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 214; + constexpr int MANDELBROT_ITERATION_DIGITS10 = 24; constexpr int MANDELBROT_CALCULATION_PIXELS_X = 2048; constexpr int MANDELBROT_CALCULATION_PIXELS_Y = 2048; - constexpr int MANDELBROT_CALCULATION_ITERATIONS = 8000; - - constexpr char MANDELBROT_POINT_DX_HALF[] = "1.15E-31"; - constexpr char MANDELBROT_POINT_DY_HALF[] = "1.15E-31"; - constexpr char MANDELBROT_POINT_CENTER_X[] = "-1.9771841957832528683253271547935727033203125"; - constexpr char MANDELBROT_POINT_CENTER_Y[] = "+0.0003701587934278647349697471824343197265625"; - - #if 0 - constexpr int MANDELBROT_COORD_PNT_DIGITS10 = 132; - constexpr int MANDELBROT_ITERATION_DIGITS10 = 132; - constexpr int MANDELBROT_CALCULATION_PIXELS_X = 512; - constexpr int MANDELBROT_CALCULATION_PIXELS_Y = 512; - constexpr int MANDELBROT_CALCULATION_ITERATIONS = 12000; - - constexpr char MANDELBROT_POINT_DX_HALF[] = "1.35E-92"; - constexpr char MANDELBROT_POINT_DY_HALF[] = "1.35E-92"; - constexpr char MANDELBROT_POINT_CENTER_X[] = "-1.711024498065425783442616962887150075536644429276936212772197371643420276616709106166700677273062220703125"; - constexpr char MANDELBROT_POINT_CENTER_Y[] = "+0.003998130357843762350089770108611803382417083111382471700501416344256825824943651749566227455277501953125"; - #endif - - #define MANDELBROT_GENERATOR_TYPE mandelbrot_generator_trivial // NOLINT(cppcoreguidelines-macro-usage) + constexpr int MANDELBROT_CALCULATION_ITERATIONS = 14000; + + constexpr char MANDELBROT_POINT_DX_HALF[] = "8.0E-190"; + constexpr char MANDELBROT_POINT_DY_HALF[] = "8.0E-190"; + constexpr char MANDELBROT_POINT_CENTER_X[] = "-1.8699746396068234286692870030368768342037915453642718845509028250103459986994857328215914371327608244573050112378162372813745137414275903616640983656639053254827407629999158221608411935399712125613169306975303341796875"; + constexpr char MANDELBROT_POINT_CENTER_Y[] = "+0.0014397083058718932815517159691261764084009958345476625415401283362782412191970631987534414177842258005688394204420205338263522643408260217088410151729628883966663578850294616803557413620305357059671210545313455078125"; + + #define MANDELBROT_GENERATOR_TYPE mandelbrot_generator_perturbative // NOLINT(cppcoreguidelines-macro-usage) #include diff --git a/mandelbrot_vs2022.vcxproj b/mandelbrot_vs2022.vcxproj index 2ef0b1e..85d5573 100644 --- a/mandelbrot_vs2022.vcxproj +++ b/mandelbrot_vs2022.vcxproj @@ -132,8 +132,9 @@ + - + diff --git a/mandelbrot_vs2022.vcxproj.filters b/mandelbrot_vs2022.vcxproj.filters index 6f04042..5d83813 100644 --- a/mandelbrot_vs2022.vcxproj.filters +++ b/mandelbrot_vs2022.vcxproj.filters @@ -114,7 +114,7 @@ Source Files\mandelbrot\cfg - + Source Files\mandelbrot\cfg @@ -153,6 +153,9 @@ Source Files\mandelbrot + + Source Files\mandelbrot\cfg + diff --git a/test/test_mandelbrot.cpp b/test/test_mandelbrot.cpp index 4197e33..e40b6b5 100644 --- a/test/test_mandelbrot.cpp +++ b/test/test_mandelbrot.cpp @@ -47,8 +47,9 @@ //#include //#include //#include +//#include //#include -//#include +//#include //#include //#include