Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/1.0.9.4 #15

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

Release/1.0.9.4 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c06f8cd
Update
hrkalona Oct 4, 2024
302dd7c
Update
hrkalona Oct 11, 2024
d2726ac
Update
hrkalona Oct 11, 2024
49f5d64
Update
hrkalona Oct 12, 2024
b2a2dc7
Update
hrkalona Oct 12, 2024
e0bd450
Update
hrkalona Oct 13, 2024
24e75b6
Update
hrkalona Oct 13, 2024
157a4e0
Update
hrkalona Oct 13, 2024
a1ca4df
Update
hrkalona Oct 14, 2024
9b8f02c
Update
hrkalona Oct 14, 2024
833c7f7
Update
hrkalona Oct 14, 2024
10fe628
Update
hrkalona Oct 14, 2024
3739c68
Update
hrkalona Oct 14, 2024
58eb06f
Update
hrkalona Oct 14, 2024
494b7bd
Update
hrkalona Oct 15, 2024
cbb5113
Update
hrkalona Oct 16, 2024
09aa056
Update
hrkalona Oct 16, 2024
990c26e
Update
hrkalona Oct 17, 2024
052210f
Update
hrkalona Oct 18, 2024
cc21d82
Update
hrkalona Oct 18, 2024
615f0f1
Update
hrkalona Oct 18, 2024
21ad9ef
Update
hrkalona Oct 20, 2024
27ad1af
Update
hrkalona Oct 21, 2024
faf452b
Update
hrkalona Oct 21, 2024
9f4754c
Update
hrkalona Oct 21, 2024
68b511b
Update
hrkalona Oct 21, 2024
8cea98e
Update
hrkalona Oct 22, 2024
529bb3d
Update
hrkalona Oct 30, 2024
bb4e7b5
Update
hrkalona Oct 31, 2024
590079a
Update
hrkalona Nov 1, 2024
1185d46
Update
hrkalona Nov 1, 2024
015b1c0
Update
hrkalona Nov 2, 2024
a82de5b
Update
hrkalona Nov 3, 2024
2c4d47a
Update
hrkalona Nov 6, 2024
c27336e
Update
hrkalona Nov 11, 2024
8cd2894
Update
hrkalona Nov 11, 2024
f4daf32
Update
hrkalona Nov 11, 2024
7668d43
Update
hrkalona Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file renamed lib/flatlaf-3.5.1.jar → lib/flatlaf-3.5.2.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed lib/jackson-annotations-2.16.0.jar → lib/jackson-annotations-2.18.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/jackson-core-2.16.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/jackson-core-2.18.1.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed lib/jackson-databind-2.16.0.jar → lib/jackson-databind-2.18.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/rsyntaxtextarea-3.5.2.jar
View file
Open in desktop
Binary file not shown.
14 changes: 10 additions & 4 deletions src/fractalzoomer/bailout_conditions/CircleBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;


Expand All @@ -18,16 +19,16 @@ public class CircleBailoutCondition extends BailoutCondition {
private MpirBigNum temp1p;
private MpirBigNum temp2p;

public CircleBailoutCondition(double bound, boolean allocateMemory) {
public CircleBailoutCondition(double bound, boolean allocateMemory, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if(allocateMemory) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down Expand Up @@ -81,7 +82,12 @@ public boolean escaped(BigIntNumComplex z, BigIntNumComplex zold, BigIntNumCompl

@Override
public boolean escaped(MpfrBigNumComplex z, MpfrBigNumComplex zold, MpfrBigNumComplex zold2, int iterations, MpfrBigNumComplex c, MpfrBigNumComplex start, MpfrBigNumComplex c0, MpfrBigNum norm_squared, MpfrBigNumComplex pixel) {
return z.norm_squared(temp1, temp2).compare(bound) >= 0;
if(useThreads) {
return z.norm_squared(temp1, temp2).compare(bound) >= 0;
}
else {
return z.norm_squared_no_threads(temp1, temp2).compare(bound) >= 0;
}
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/CrossBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

/**
Expand All @@ -17,15 +18,15 @@ public class CrossBailoutCondition extends BailoutCondition {
private MpirBigNum temp1p;
private MpirBigNum temp2p;

public CrossBailoutCondition(double bound) {
public CrossBailoutCondition(double bound, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/CustomBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

public class CustomBailoutCondition extends BailoutCondition {
Expand All @@ -12,15 +13,15 @@ public class CustomBailoutCondition extends BailoutCondition {
private MpirBigNum temp1p;
private MpirBigNum temp2p;

public CustomBailoutCondition(double bound) {
public CustomBailoutCondition(double bound, Fractal f) {

super(Math.pow(bound, 1 / Math.sqrt(bound)));

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/FieldLinesBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

/**
Expand All @@ -17,15 +18,15 @@ public class FieldLinesBailoutCondition extends BailoutCondition {
private MpirBigNum temp2p;


public FieldLinesBailoutCondition(double bound) {
public FieldLinesBailoutCondition(double bound, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/ImaginaryStripBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

/**
Expand All @@ -14,14 +15,14 @@ public class ImaginaryStripBailoutCondition extends BailoutCondition {
private MpfrBigNum temp1;
private MpirBigNum temp1p;

public ImaginaryStripBailoutCondition(double bound) {
public ImaginaryStripBailoutCondition(double bound, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/fractalzoomer/bailout_conditions/NNormBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public NNormBailoutCondition(double bound, double n_norm) {
Baf = new MyApfloat(B);


if(!LibMpfr.hasError()) {
if(!LibMpfr.mpfrHasError()) {
mpfrbn_norm = new MpfrBigNum(n_norm);
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/RealPlusImaginarySquaredBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

/**
Expand All @@ -14,15 +15,15 @@ public class RealPlusImaginarySquaredBailoutCondition extends BailoutCondition {
private MpfrBigNum temp1;
private MpirBigNum temp1p;

public RealPlusImaginarySquaredBailoutCondition(double bound) {
public RealPlusImaginarySquaredBailoutCondition(double bound, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if(TaskRender.allocateMPFR()) {
if(TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
}
else if(TaskRender.allocateMPIR()) {
else if(TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/RealStripBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;


Expand All @@ -16,15 +17,15 @@ public class RealStripBailoutCondition extends BailoutCondition {
private MpfrBigNum temp1;
private MpirBigNum temp1p;

public RealStripBailoutCondition(double bound) {
public RealStripBailoutCondition(double bound, Fractal f) {

super(bound);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if(TaskRender.allocateMPFR()) {
if(TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
}
else if(TaskRender.allocateMPIR()) {
else if(TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/RhombusBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.core.norms.Norm1;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

/**
Expand All @@ -19,17 +20,17 @@ public class RhombusBailoutCondition extends BailoutCondition {
private MpirBigNum temp1p;
private MpirBigNum temp2p;

public RhombusBailoutCondition(double bound) {
public RhombusBailoutCondition(double bound, Fractal f) {

super(bound);

normImpl = new Norm1();

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/bailout_conditions/SquareBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.core.norms.NormInfinity;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;
import org.apfloat.ApfloatMath;

Expand All @@ -20,17 +21,17 @@ public class SquareBailoutCondition extends BailoutCondition {
private MpirBigNum temp1p;
private MpirBigNum temp2p;

public SquareBailoutCondition(double bound) {
public SquareBailoutCondition(double bound, Fractal f) {

super(bound);

normImpl = new NormInfinity();

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/convergent_bailout_conditions/CircleDistanceBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

public class CircleDistanceBailoutCondition extends ConvergentBailoutCondition {
private MpfrBigNum temp1;
private MpfrBigNum temp2;
private MpirBigNum temp1p;
private MpirBigNum temp2p;
public CircleDistanceBailoutCondition(double convergent_bailout) {
public CircleDistanceBailoutCondition(double convergent_bailout, Fractal f) {
super(convergent_bailout);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
}
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/convergent_bailout_conditions/KFCircleDistanceBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import fractalzoomer.core.*;
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

public class KFCircleDistanceBailoutCondition extends ConvergentBailoutCondition {
Expand All @@ -14,16 +15,16 @@ public class KFCircleDistanceBailoutCondition extends ConvergentBailoutCondition
private MpirBigNum temp2p;
private MpirBigNum temp3p;
private MpirBigNum temp4p;
public KFCircleDistanceBailoutCondition(double convergent_bailout) {
public KFCircleDistanceBailoutCondition(double convergent_bailout, Fractal f) {
super(convergent_bailout);

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
temp3 = new MpfrBigNum();
temp4 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
temp3p = new MpirBigNum();
Expand Down
2 changes: 1 addition & 1 deletion src/fractalzoomer/convergent_bailout_conditions/KFNNormDistanceBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public KFNNormDistanceBailoutCondition(double convergent_bailout, double n_norm)
ddcn_norm_reciprocal = ddcn_norm.reciprocal();
}

if(!LibMpfr.hasError()) {
if(!LibMpfr.mpfrHasError()) {
mpfrbn_norm = new MpfrBigNum(n_norm);
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/convergent_bailout_conditions/KFRhombusDistanceBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.core.norms.Norm1;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;

public class KFRhombusDistanceBailoutCondition extends ConvergentBailoutCondition {
Expand All @@ -15,18 +16,18 @@ public class KFRhombusDistanceBailoutCondition extends ConvergentBailoutConditio
private MpirBigNum temp2p;
private MpirBigNum temp3p;
private MpirBigNum temp4p;
public KFRhombusDistanceBailoutCondition(double convergent_bailout) {
public KFRhombusDistanceBailoutCondition(double convergent_bailout, Fractal f) {
super(convergent_bailout);

normImpl = new Norm1();

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
temp3 = new MpfrBigNum();
temp4 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
temp3p = new MpirBigNum();
Expand Down
7 changes: 4 additions & 3 deletions src/fractalzoomer/convergent_bailout_conditions/KFSquareDistanceBailoutCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import fractalzoomer.core.mpfr.MpfrBigNum;
import fractalzoomer.core.mpir.MpirBigNum;
import fractalzoomer.core.norms.NormInfinity;
import fractalzoomer.functions.Fractal;
import org.apfloat.Apfloat;
import org.apfloat.ApfloatMath;

Expand All @@ -16,18 +17,18 @@ public class KFSquareDistanceBailoutCondition extends ConvergentBailoutCondition
private MpirBigNum temp2p;
private MpirBigNum temp3p;
private MpirBigNum temp4p;
public KFSquareDistanceBailoutCondition(double convergent_bailout) {
public KFSquareDistanceBailoutCondition(double convergent_bailout, Fractal f) {
super(convergent_bailout);

normImpl = new NormInfinity();

if(TaskRender.PERTURBATION_THEORY || TaskRender.HIGH_PRECISION_CALCULATION) {
if (TaskRender.allocateMPFR()) {
if (TaskRender.allocateMPFR(f)) {
temp1 = new MpfrBigNum();
temp2 = new MpfrBigNum();
temp3 = new MpfrBigNum();
temp4 = new MpfrBigNum();
} else if (TaskRender.allocateMPIR()) {
} else if (TaskRender.allocateMPIR(f)) {
temp1p = new MpirBigNum();
temp2p = new MpirBigNum();
temp3p = new MpirBigNum();
Expand Down
Loading