remove parameters specific to my environment

5eec49ac · Sam Thiriot · 040b789c · 5eec49ac · 5eec49ac · 5eec49ac
Commit 5eec49ac authored Aug 26, 2020 by Sam Thiriot
5 changed files
--- a/genetic-algos-visu/plot_iterations_as_mp4video.oms
+++ b/genetic-algos-visu/plot_iterations_as_mp4video.oms
@@ -56,26 +56,19 @@ val taskPlotAsVideo = RTask("""

    """,
    install = Seq(
-        "fakeroot sed -i 's/deb.debian.org/linux.pleiade.edf.fr/g' /etc/apt/sources.list",
-        "fakeroot cat /etc/apt/sources.list",
-        // update the list of available packages
+       // update the list of available packages
        "fakeroot apt-get -o Acquire::http::proxy=false update ",
-        
        // required; attempts to update dbus to a newer version would require permissions we do not have
        "DEBIAN_FRONTEND=noninteractive fakeroot apt-mark hold dbus", 
        """echo "dbus hold" | fakeroot dpkg --set-selections""",
-
        // install the libs required for the compilation of R packages
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
        // install external tools in the VM for rendering
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y ffmpeg",
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y ffmpeg",
        ), //  
-    libraries = Seq() // "ggplot2","gganimate","plotly","GGally","htmlwidgets"
-    //resources = Seq(workDirectory / "multiobjective/results/ConstrEx")
+    libraries = Seq() // were installed with the binary version earlier
 ) set (
    inputFiles += (directoryWithResults, "mydirectory"),
    outputFiles += ("/tmp/render.mp4", video),
@@ -106,4 +99,4 @@ taskPlotAsVideo set (
    ) hook CopyFileHook(video, workDirectory/"iterations_video.mp4" ) 
    )

-  
\ No newline at end of file
+  
--- a/genetic-algos-visu/plot_iterations_as_plotly.oms
+++ b/genetic-algos-visu/plot_iterations_as_plotly.oms
@@ -63,27 +63,20 @@ val taskPlotAsVideo = RTask("""
    print("done")
    
    """,
-    install = Seq(
-        "fakeroot sed -i 's/deb.debian.org/linux.pleiade.edf.fr/g' /etc/apt/sources.list",
-        "fakeroot cat /etc/apt/sources.list",
-        // update the list of available packages
+        install = Seq(
+       // update the list of available packages
        "fakeroot apt-get -o Acquire::http::proxy=false update ",
-        
        // required; attempts to update dbus to a newer version would require permissions we do not have
        "DEBIAN_FRONTEND=noninteractive fakeroot apt-mark hold dbus", 
        """echo "dbus hold" | fakeroot dpkg --set-selections""",
-
        // install the libs required for the compilation of R packages
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
-        
-        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y ffmpeg",
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
+        // install external tools in the VM for rendering
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y ffmpeg",
        ), //  
-    libraries = Seq() // "ggplot2","gganimate","plotly","GGally","htmlwidgets"
-    //resources = Seq(workDirectory / "multiobjective/results/ConstrEx")
+    libraries = Seq() // were installed with the binary version earlier
 ) set (
    inputFiles += (directoryWithResults, "mydirectory"),
    outputFiles += ("/tmp/evolution.zip", plotlyPage),
@@ -108,4 +101,4 @@ taskPlotAsVideo set (
    ) hook CopyFileHook(plotlyPage, workDirectory/"evolutionPlotly.zip" ) 
    )

-  
\ No newline at end of file
+  
--- a/genetic-algos-visu/plot_iterations_as_png.oms
+++ b/genetic-algos-visu/plot_iterations_as_png.oms
@@ -51,26 +51,19 @@ val taskPlotEvereyIteration = RTask("""
        device=graphFormat)
    """,
    install = Seq(
-        "fakeroot sed -i 's/deb.debian.org/linux.pleiade.edf.fr/g' /etc/apt/sources.list",
-        "fakeroot cat /etc/apt/sources.list",
-        // update the list of available packages
+       // update the list of available packages
        "fakeroot apt-get -o Acquire::http::proxy=false update ",
-        
        // required; attempts to update dbus to a newer version would require permissions we do not have
        "DEBIAN_FRONTEND=noninteractive fakeroot apt-mark hold dbus", 
        """echo "dbus hold" | fakeroot dpkg --set-selections""",
-
        // install the libs required for the compilation of R packages
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
        // install external tools in the VM for rendering
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y ffmpeg",
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y ffmpeg",
        ), //  
-    libraries = Seq() // "ggplot2","gganimate","plotly","GGally","htmlwidgets"
-    //resources = Seq(workDirectory / "multiobjective/results/ConstrEx")
+    libraries = Seq() // were installed with the binary version earlier
 ) set (
    inputFiles += (directoryWithResults, "mydirectory"),
    outputFiles += ("/tmp/rendered", pngForIterations),
@@ -101,4 +94,4 @@ taskPlotEvereyIteration set (
    ) hook CopyFileHook(pngForIterations, workDirectory/"iterations as graphs" ) 
    )

-  
\ No newline at end of file
+  
--- a/genetic-algos-visu/plot_last_iteration.oms
+++ b/genetic-algos-visu/plot_last_iteration.oms
@@ -44,26 +44,19 @@ val taskPlotLastParetoFront = RTask("""
    
    """,
    install = Seq(
-        "fakeroot sed -i 's/deb.debian.org/linux.pleiade.edf.fr/g' /etc/apt/sources.list",
-        "fakeroot cat /etc/apt/sources.list",
-        // update the list of available packages
+       // update the list of available packages
        "fakeroot apt-get -o Acquire::http::proxy=false update ",
-        
        // required; attempts to update dbus to a newer version would require permissions we do not have
        "DEBIAN_FRONTEND=noninteractive fakeroot apt-mark hold dbus", 
        """echo "dbus hold" | fakeroot dpkg --set-selections""",
-
        // install the libs required for the compilation of R packages
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
-        
-        // install external tools in the VM for rendering 
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y ffmpeg",
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
+        // install external tools in the VM for rendering
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y ffmpeg",
        ), //  
-    libraries = Seq() // "ggplot2","gganimate","plotly","GGally","htmlwidgets"
-    //resources = Seq(workDirectory / "multiobjective/results/ConstrEx")
+    libraries = Seq() // were installed with the binary version earlier
 ) set (
    inputFiles += (directoryWithResults, "mydirectory"),
    outputFiles += ("/tmp/last_pareto", lastPareto),
@@ -98,4 +91,4 @@ taskPlotLastParetoFront set (
    ) hook CopyFileHook(lastPareto, workDirectory/"last Pareto front.png" ) 
    )

-  
\ No newline at end of file
+  
--- a/genetic-algos-visu/plot_pairs.oms
+++ b/genetic-algos-visu/plot_pairs.oms
@@ -42,26 +42,19 @@ val taskPlotEvereyIteration = RTask("""
    
    """,
    install = Seq(
-        "fakeroot sed -i 's/deb.debian.org/linux.pleiade.edf.fr/g' /etc/apt/sources.list",
-        "fakeroot cat /etc/apt/sources.list",
-        // update the list of available packages
+       // update the list of available packages
        "fakeroot apt-get -o Acquire::http::proxy=false update ",
-        
        // required; attempts to update dbus to a newer version would require permissions we do not have
        "DEBIAN_FRONTEND=noninteractive fakeroot apt-mark hold dbus", 
        """echo "dbus hold" | fakeroot dpkg --set-selections""",
-
        // install the libs required for the compilation of R packages
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y libssl-dev libcurl4-openssl-dev libudunits2-dev",
        // install required R packages in their binary version (quicker, much stable!)
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
-        
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y r-cran-ggplot2 r-cran-gganimate r-cran-ggally r-cran-plotly r-cran-zip",
        // install external tools in the VM for rendering
-        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get -o Acquire::http::proxy=false install -y ffmpeg",
+        "DEBIAN_FRONTEND=noninteractive fakeroot apt-get install -y ffmpeg",
        ), //  
-    libraries = Seq() // "ggplot2","gganimate","plotly","GGally","htmlwidgets"
-    //resources = Seq(workDirectory / "multiobjective/results/ConstrEx")
+    libraries = Seq() // were installed with the binary version earlier
 ) set (
    inputFiles += (directoryWithResults, "mydirectory"),
    outputFiles += ("/tmp/pairs.png", pngForPairs),
@@ -86,4 +79,4 @@ taskPlotEvereyIteration set (
    ) hook CopyFileHook(pngForPairs, workDirectory/"pairs.png" ) 
    )

-  
\ No newline at end of file
+