Updated fitpredict.jl docs

Author: alebonfanti

docs/src/fitpredictFreq.jl

@@ -59,26 +59,22 @@ rheofreqdatatype(data_ext)
 
 fractKV_predict = dynamicmodelpredict(data_ext, FractKV_model)
 
-## Now we can plot data and model together for comparison
+# Now we can plot data and model together for comparison
 using Plots
-
-# Create the plot
+## Create the plot
 p = plot(
     xaxis = :log10, 
     yaxis = :log10, 
     xlabel = "Frequency", 
     ylabel = "Storage and Loss moduli",
-    legend = :topright
+    legend = :topright, linewidth=4, framestyle = :box
 )
-
-# Plot data points
+## Plot data points
 scatter!(p, data.ω, data.Gp, markersize = 5, color = :blue, label = "Gp data")
 scatter!(p, data.ω, data.Gpp, markersize = 5, color = :red, label = "Gpp data")
-
-# Plot model predictions
+## Plot model predictions
 plot!(p, fractKV_predict.ω, fractKV_predict.Gp, linestyle = :dash, color = :blue, label = "Gp model")
 plot!(p, fractKV_predict.ω, fractKV_predict.Gpp, linestyle = :dash, color = :red, label = "Gpp model")
-
 #!nb p #hide
 
 # #### Simulate Different Model Behaviours
@@ -96,13 +92,12 @@ dσ = stressfunction(dσ, hstep())
 FractKV_creepPredict = modelsteppredict(dσ, FractKV_model)
 ## Visualisation of the simulated response
 using Plots
-
 p = plot(size = (700, 500) )
 plot!(p, FractKV_creepPredict.t,
     FractKV_creepPredict.ϵ,
     xlabel = "Time",
     ylabel = "Strain",
-    legend = false,
+    legend = false, linewidth=4, framestyle = :box
 )
 #!nb p #hide
 

docs/src/fitpredictTime.jl

@@ -82,19 +82,17 @@ using Plots
 p = plot(size = (700, 500))
 plot!(p , data.t, data.σ,
     seriestype = :scatter,      # "o" markers
-    markersize = 5,
+    markersize = 6,
     label = "Data",
     xlabel = "Time",
     ylabel = "Stress",
-    legend = :topright
-)
-
-# Overlay the model prediction
+    legend = :topright,
+    framestyle = :box)
+## Overlay the model prediction
 plot!(p, maxwell_predict.t, maxwell_predict.σ,
     color = :red,
-    label = "Maxwell Model"
-)
-
+    label = "Maxwell Model", 
+    linewidth=4, framestyle = :box)
 #!nb p #hide
 
 # #### Simulate different model behaviours
@@ -120,14 +118,14 @@ plot!(p, maxwell_creepPredict.t,
     linestyle = :dash,
     label = "Applied Stress",
     xlabel = "Time",
-    ylabel = "Strain"
-)
+    ylabel = "Strain", 
+    linewidth=4, framestyle = :box)
 ## Visualisation of the simulated response
 plot!(p, maxwell_creepPredict.t,
     maxwell_creepPredict.ϵ,
     linestyle = :solid,
-    label = "Simulated Strain"
-)
+    label = "Simulated Strain", 
+    linewidth=4, framestyle = :box)
 #!nb p #hide
 
 #md # !!! warning "Important"
@@ -150,12 +148,9 @@ plot!(p, maxwell_creepPredict.t, maxwell_creepPredict.σ,
     linestyle = :dash,
     label = "Applied Stress",
     xlabel = "Time",
-    ylabel = "Strain"
-)
-
-# Overlay the simulated strain response
+    ylabel = "Strain", linewidth=4, framestyle = :box)
+## Overlay the simulated strain response
 plot!(p, maxwell_creepPredict.t, maxwell_creepPredict.ϵ,
     linestyle = :solid,
-    label = "Simulated Strain"
-)
+    label = "Simulated Strain", linewidth=4, framestyle = :box)
 #!nb p #hide

docs/src/gendata.jl

@@ -47,47 +47,47 @@ plot!(p, dstep.t, dstep.ϵ,
       subplot = 1,
       ylim = (-0.1, 5.4),
       title = "Step",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Ramp generation
 dramp = strainfunction(datat, ramp(offset = 2.0, gradient = 0.8))
 plot!(p, dramp.t, dramp.ϵ,
       subplot = 2,
       ylim = (-0.1, :auto),
       title = "Ramp",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Stairs generation
 dstairs = strainfunction(datat, stairs(offset = 5.0, amp = 0.1, width = 1))
 plot!(p, dstairs.t, dstairs.ϵ,
       subplot = 3,
       ylim = (-0.1, :auto),
       title = "Stairs",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Square generation
 dsquare = strainfunction(datat, square(offset = 5.0, amp = 0.5, period = 4, width = 1))
 plot!(p, dsquare.t, dsquare.ϵ,
       subplot = 4,
       ylim = (-0.05, 0.6),
       title = "Square",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Sawtooth generation
 dsawtooth = strainfunction(datat, sawtooth(offset = 5.0, amp = 2, period = 5))
 plot!(p, dsawtooth.t, dsawtooth.ϵ,
       subplot = 5,
       ylim = (-0.1, 2.2),
       title = "Sawtooth",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Triangle generation
 dtriangle = strainfunction(datat, triangle(offset = 4.0, amp = 1, period = 4))
 plot!(p, dtriangle.t, dtriangle.ϵ,
       subplot = 6,
       ylim = (-0.1, 1.2),
       title = "Triangle",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 #!nb p #hide
 
@@ -106,22 +106,22 @@ plot!(p, dhold.t, dhold.ϵ,
       subplot = 2,
       ylim = (-0.1, 2.8),
       title = "Ramp & hold",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Step with oscillatory loading
 doscil = dstep + dsquare
 plot!(p, doscil.t, doscil.ϵ,
       subplot = 1,
       ylim = (-0.5, 6),
       title = "Oscillations",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 ## Ramp & hold & oscillation
 dcomplex = dhold + dsquare
 plot!(p, dcomplex.t, dcomplex.ϵ,
       subplot = 3,
       ylim = (-0.1, 3.2),
       title = "Ramp & hold & oscillations",
-      linewidth=4, framestyle = :box)
+      lable = "", linewidth=4, framestyle = :box)
 
 #!nb p #hide