Merge pull request #209 from MSoegtropIMC/fix_examples

Re-implement PixMap writer in Elpi

configure.sh

@@ -4,7 +4,7 @@
 
 cp -f Make.in Make
 
-DIRECTORIES="algebra complex coq_reals fta ftc liouville logic metrics model raster reals tactics transc order metric2 stdlib_omissions util classes ode"
+DIRECTORIES="algebra complex coq_reals fta ftc liouville logic metrics model raster reals tactics transc order metric2 stdlib_omissions util classes ode write_image"
 
 find $DIRECTORIES -name "*.v" >>Make
 

coq-corn.opam

@@ -48,6 +48,7 @@ install: [make "install"]
 depends: [
   "coq" {(>= "8.18" & < "8.20~") | (= "dev")}
   "coq-math-classes" {(>= "8.8.1") | (= "dev")}
+  "coq-elpi" {(>= "1.18.0") | (= "dev")}
   "coq-bignums" 
 ]
 

examples/Circle.v

@@ -3,18 +3,18 @@
 (* I define the image of a path, a [Compact] subset of the plane.*)
 (* Finally, plot a hi-res Circle*)
 
-Require Import Plot RasterQ Qmetric.
+From CoRN Require Import Plot RasterQ Qmetric.
 Require Import CoRN.reals.fast.Interval.
 Require Import CoRN.metric2.MetricMorphisms.
 Require Import CoRN.reals.faster.ARArith.
-Require Import ARplot.
+From CoRN Require Import ARplot.
 Require Import CoRN.reals.faster.ARcos
         CoRN.reals.faster.ARsin
         CoRN.reals.faster.ARexp
         CoRN.reals.faster.ARbigD
         CoRN.reals.faster.ARinterval.
 Require Import CoRN.reals.fast.CRtrans.
-Require Import CoRN.dump.theories.Loader.
+Require Import CoRN.write_image.WritePPM.
 
 Local Open Scope uc_scope.
 
@@ -47,21 +47,19 @@ Definition Cos_faster : sparse_raster _ _
 
 End PlotCirclePath.
 
-(* 6 seconds *)
-Time Definition Circle_bigD : sparse_raster _ _
-  := Eval vm_compute in 
-      @Circle_faster bigD _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ bigD_appRat.
+Definition Circle_bigD : sparse_raster _ _
+  := @Circle_faster bigD _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ bigD_appRat.
 
-DumpGrayMap Circle_bigD.
-(* Now have a look at plot.pgm *)
+(* 3.7s on Apple M1 - this is mostly the creation of the sparse raster *)
+Time Elpi WritePPM "Circle.ppm" ( Circle_bigD ).
+(* Now have a look at Circle.ppm *)
 
-Time Definition Cos_bigD : sparse_raster _ _
-  := Eval vm_compute in 
-      @Cos_faster bigD _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ bigD_appRat.
-
-DumpGrayMap Cos_bigD.
-(* Now have a look at plot.pgm *)
+Definition Cos_bigD : sparse_raster _ _
+  := @Cos_faster bigD _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ bigD_appRat.
 
+(* 3.1s on Apple M1 *)
+Time Elpi WritePPM "Cos.ppm" ( Cos_bigD ).
+(* Now have a look at Cos.ppm *)
 
 Definition CircleFunction_aux
   : ProductMS Q_as_MetricSpace Q_as_MetricSpace --> ProductMS CR CR
@@ -70,20 +68,18 @@ Definition CircleFunction_aux
 Definition CirclePath : Q_as_MetricSpace --> Complete Q2:= 
   (uc_compose (uc_compose Couple CircleFunction_aux) (diag Q_as_MetricSpace)).
 (* The following hangs:
+   TODO this does not even compile
 Definition CirclePath': UCFunction Q R2:= 
-  ucFunction (fun q:Q => Couple (cos_uc q, sin_uc q)).*)
+  ucFunction (fun q:Q => Couple (cos_uc q, sin_uc q)). *)
 
 
-(* 20 seconds *)
-(* The raster must be evaluated before being plotted by DumpGrayMap,
-   here with vm_compute. *)
-Time Definition Circle : sparse_raster _ _
-  := Eval vm_compute in
-      (let (_,r) := Plot.PlotPath 0 7 (-(1)) 1 (reflexivity _)
+Definition Circle : sparse_raster _ _
+  := (let (_,r) := Plot.PlotPath 0 7 (-(1)) 1 (reflexivity _)
                              (-(1)) 1 (reflexivity _) 200 CirclePath
       in r). 
 
-DumpGrayMap Circle.
-(* Now have a look at plot.pgm *)
+(* 16.3 seconds on Apple M1 *)
+Time Elpi WritePPM "Circle2.ppm" ( Circle ).
+(* Now have a look at Circle2.ppm *)
 
 

examples/bigD.v

@@ -1,10 +1,6 @@
-Require Import
-  Program QArith ZArith Bignums.BigZ.BigZ Qpossec
-  MetricMorphisms Qmetric Qdlog ARArith
-  MathClasses.implementations.stdlib_rationals
-  MathClasses.implementations.stdlib_binary_integers
-  MathClasses.implementations.fast_integers
-  MathClasses.implementations.dyadics.
+Require Import Program QArith ZArith Bignums.BigZ.BigZ.
+From CoRN Require Import Qpossec MetricMorphisms Qmetric Qdlog ARArith.
+From MathClasses.implementations Require Import stdlib_rationals stdlib_binary_integers fast_integers dyadics.
 
 Add Field Q : (dec_fields.stdlib_field_theory Q).
 
@@ -31,7 +27,6 @@ Check ((1 _):(Z⁺)).
 
 Time Eval native_compute in (test (square x)). 
 
-
-Require Import ARbigD.
+From CoRN Require Import ARbigD.
 Time Eval vm_compute in (test (bigD_div (square x) x (10000%Z))).
-Require Import ApproximateRationals.
+From CoRN Require Import ApproximateRationals.

write_image/README

@@ -0,0 +1,9 @@
+write_image writes a CoRN "sparse_raster" to a file in PPM (portable pixmap) format.
+
+Usage:
+
+Require Import CoRN.write_image.WritePPM.
+
+<create a sparse_raster object>
+
+Elpi WritePPM "<filename>.ppm" ( <sparse_raster object> ).