pmeunier/grain - Change C56DYYC72SFNR6BSKCOVDY2QW6XNP66EUGGKCBROTCFJVQDB4FUAC

Branchement du simulateur sur la synthèse

Created by pmeunier on November 27, 2023

C56DYYC72SFNR6BSKCOVDY2QW6XNP66EUGGKCBROTCFJVQDB4FUAC

Dependencies

In channels

main

Change contents

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 11 [3.784923]
[3.785270]
[4.26026]
```
 export let prodWeekly: number[] = []
 export let maxProd: number = 0
```
Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 19 [3.784923]
B:BD[4.26218] → [4.26218:26245]
```
 let pvgis_loading = false
```
[4.26218]
[4.26245]
```
 export let pvgis_loading = false
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 159 [3.784923]
[3.786558]
[3.786591]
```
     console.log(total, annee)
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 246 [3.784923]

B:BD[5.353721] → [5.353721:353769]

∅:D[5.353769] → [3.787270:787313]

B:BD[3.787270] → [3.787270:787313]

 async function updatePlot(puissance: number) {
     if(!browser) {
         return
     }

[5.353721]

[4.27319]

 async function updatePv(puissance: number) {
     let d = new Date()
     let min_t = (new Date(d.getFullYear(), 0, 1)).getTime() / 1000
     let max_t = min_t + 364 * 24 * 3600

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 251 [3.784923]
[4.27420]
[4.27420]
```
         pvgis_loading = true
         await tick()
```
Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 262 [3.784923]
[4.27697]
[3.787753]
```
         pvgis_loading = false
         await tick()
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 268 [3.784923]

B:BD[4.27808] → [4.27808:27915]

     somme.hourly = {x: [], y: []};
     somme.daily = {x: [], y: []};
     somme.weekly = {x: [], y: []};

[4.27808]

[4.27915]

     maxProd = 0
     const start = new Date(min_t * 1000)
     const janvier = new Date(start.getFullYear(), 0, 1)
     for(let t = min_t; t < max_t; t += 3600) {
         let tt = new Date(t*1000);
         let tts = tt.toLocaleString()
         let tds = tt.toLocaleDateString()
         let pp = 0
         if(pvgis) {
             let len = pvgis.outputs.hourly.length
             let n = ((t * 1000 - janvier.getTime()) / 3600000) % len
             const pvvar = 'P'
             pp = pvgis.outputs.hourly[Math.floor(n)][pvvar] * puissance / 1000
             soleil.hourly.x.push(tts)
             soleil.hourly.y.push(pp)
             if((t - min_t) % (24 * 3600) == 0) {
                 if((t - min_t) % (24 * 7 * 3600) == 0) {
                     if(soleil.weekly.y.length) {
                         maxProd = Math.max(maxProd, soleil.weekly.y[soleil.weekly.y.length-1])
                     }
                     soleil.weekly.x.push(tds)
                     soleil.weekly.y.push(pp)
                 } else {
                     soleil.weekly.y[soleil.weekly.y.length-1] += pp
                 }
                 soleil.daily.x.push(tds)
                 soleil.daily.y.push(pp)
             } else {
                 soleil.daily.y[soleil.daily.y.length-1] += pp
                 soleil.weekly.y[soleil.weekly.y.length-1] += pp
             }
         }
     }
     prodWeekly = soleil.weekly.y
 }
 async function updatePlot(puissance: number) {
     if(!browser) {
         return
     }

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 309 [3.784923]
[4.27916]
[3.787948]
```
     await updatePv(puissance)
```

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 377 [3.784923]

[3.789601]

[3.789985]

     somme.hourly = {x: [], y: []};
     somme.daily = {x: [], y: []};
     somme.weekly = {x: [], y: []};

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 383 [3.784923]
[3.790084]
[4.28154]
```
     let i = 0
```
Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 386 [3.784923]
B:BD[3.790211] → [4.28203:28242]
```
         let tts = tt.toLocaleString()
```

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 387 [3.784923]

∅:D[4.28285] → [3.790324:790344]

B:BD[3.790324] → [3.790324:790344]

B:BD[3.790344] → [4.28286:29208]

∅:D[4.29208] → [3.790638:790649]

B:BD[3.790638] → [3.790638:790649]

         let pp = 0
         if(pvgis) {
             let len = pvgis.outputs.hourly.length
             let n = ((t * 1000 - janvier.getTime()) / 3600000) % len
             const pvvar = 'P'
             pp = pvgis.outputs.hourly[Math.floor(n)][pvvar] * puissance / 1000
             soleil.hourly.x.push(tts)
             soleil.hourly.y.push(pp)
             if((t - min_t) % (24 * 3600) == 0) {
                 if((t - min_t) % (24 * 7 * 3600) == 0) {
                     soleil.weekly.x.push(tds)
                     soleil.weekly.y.push(pp)
                 } else {
                     soleil.weekly.y[soleil.weekly.y.length-1] += pp
                 }
                 soleil.daily.x.push(tds)
                 soleil.daily.y.push(pp)
             } else {
                 soleil.daily.y[soleil.daily.y.length-1] += pp
                 soleil.weekly.y[soleil.weekly.y.length-1] += pp
             }
             totalProd += pp
         }

[4.28285]

[3.790763]

         let tts = tt.toLocaleString()

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 424 [3.784923]

B:BD[3.791149] → [5.354882:354927]

         auto += Math.min(y, pp * puissance)

[3.791149]

[3.791182]

         totalProd += soleil.hourly.y[i]
         auto += Math.min(y, soleil.hourly.y[i] * puissance)
         i+= 1

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 467 [3.784923]

[5.355844]

[3.793606]


 let layout = {}
 function relayout(event: any) {
     let w = event["xaxis.range[1]"] - Math.max(0, event["xaxis.range[0]"])
     let layout_ = JSON.parse(JSON.stringify(layout))
     if(isNaN(w)) {
         sample(soleil)
         sample(somme)
         console.log(layout_)
         layout_.xaxis.autorange = true
         layout_.yaxis.autorange = true
         plotStyle = "min-height:450px"
         Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })
     } else {
         let sb = soleil.bucket
         if(event.bucket) {
             w *= event.bucket
         } else {
             w *= soleil.bucket
         }
         sample(soleil, w)
         sample(somme, w)
         let sb_ = soleil.bucket
         event["xaxis.range[0]"] *= sb / sb_
         event["xaxis.range[1]"] *= sb / sb_
         event.bucket = soleil.bucket
         layout_.xaxis.range = [
             event["xaxis.range[0]"],
             event["xaxis.range[1]"]
         ]
         layout_.yaxis.autorange = true
         layout_.yaxis.fixedrange = false
         plotStyle = "min-height:450px"
         Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })
     }
 };

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 515 [3.784923]
∅:D[4.31239] → [5.355905:355925]
B:BD[5.355905] → [5.355905:355925]
```
     let layout = {
```
[4.31239]
[5.355925]
```
     layout = {
```

Deletion in grain/src/routes/projet/[id]/Simulation.svelte at line 546 [3.784923]

B:BD[5.356583] → [5.356583:356626]

B:BD[5.356626] → [4.31471:31551]

∅:D[4.31551] → [5.356721:357125]

B:BD[5.356721] → [5.356721:357125]

B:BD[5.357125] → [4.31552:31728]

∅:D[4.31728] → [5.357160:357221]

B:BD[5.357160] → [5.357160:357221]

B:BD[5.357221] → [4.31729:31906]

∅:D[4.31906] → [5.357302:357339]

B:BD[5.357302] → [5.357302:357339]

B:BD[5.357339] → [4.31907:31990]

∅:D[4.31990] → [5.357445:357504]

B:BD[5.357445] → [5.357445:357504]

B:BD[5.357504] → [4.31991:32037]

∅:D[4.32037] → [5.357671:357817]

B:BD[5.357671] → [5.357671:357817]

     let relayout = function(event: any) {
         let w = event["xaxis.range[1]"] - Math.max(0, event["xaxis.range[0]"])
         let layout_ = JSON.parse(JSON.stringify(layout))
         if(isNaN(w)) {
             sample(soleil)
             sample(somme)
             console.log(layout_)
             layout_.xaxis.autorange = true
             layout_.yaxis.autorange = true
             plotStyle = "min-height:450px"
             Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })
         } else {
             let sb = soleil.bucket
             if(event.bucket) {
                 w *= event.bucket
             } else {
                 w *= soleil.bucket
             }
             sample(soleil, w)
             sample(somme, w)
             let sb_ = soleil.bucket
             event["xaxis.range[0]"] *= sb / sb_
             event["xaxis.range[1]"] *= sb / sb_
             event.bucket = soleil.bucket
             layout_.xaxis.range = [
                 event["xaxis.range[0]"],
                 event["xaxis.range[1]"]
             ]
             layout_.yaxis.autorange = true
             layout_.yaxis.fixedrange = false
             plotStyle = "min-height:450px"
             Plotly!.react('plot', [soleil, somme], layout_, { responsive: true })
         }
     };

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 547 [3.784923]

B:BD[5.357835] → [5.357835:357905]

     document.getElementById('plot')?.on('plotly_relayout', relayout)

[5.357835]

[5.357905]

     document.getElementById('plot')?.removeEventListener('plotly_relayout', relayout)
     document.getElementById('plot')?.addEventListener('plotly_relayout', relayout)

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 617 [3.784923]

B:BD[5.359657] → [5.359657:359711]

            <td style="width:1%;white-space:nowrap;">

[5.359657]

[4.32632]

            <td style="width:1%;white-space:nowrap;text-align:center">

Insertion in grain/src/routes/projet/[id]/+page.svelte at line 22 [3.804604]
[3.805265]
[3.805265]
```
 let prodWeekly: number[] = []
 let maxProd = 0
 let pvgis_loading = false
```

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 439 [3.804604]

B:BD[2.13466] → [2.13466:13958]

                            <div class="d-flex justify-content-around  p-5">
                                <div class="flex-column justify-content-between text-center   ">
                                    <div class="fs-1 fw-bold bg-cc ">
                                        <svg viewBox="0 0 300 50" xmlns="http://www.w3.org/2000/svg" width="200px">
                                            <path d={traceArray(resultatNet,N)} fill="transparent" stroke-width="2" stroke="red" />

[2.13466]

[2.13958]

                            <div class="d-flex justify-content-around p-5">
                                <div class="d-flex flex-column justify-content-between text-center me-3">
                                    <div class="py-3 my-auto">
                                        <svg viewBox="{Math.floor(-N*0.05)} {Math.floor(-maxa - margin)} {Math.ceil(N*1.1)} {Math.ceil(maxa-mina + 2 * margin)}" xmlns="http://www.w3.org/2000/svg" width="250px" height="100px" preserveAspectRatio="none">
                                            <path d={traceArray(resultatNet,N)} fill="transparent" stroke-width="2" vector-effect="non-scaling-stroke" stroke="#b71515" />

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 449 [3.804604]

B:BD[2.14150] → [2.14150:14654]

                                <div class="flex-column justify-content-between  text-center  ">
                                    <div class="fs-1 fw-bold ">
                                        <svg viewBox="0 0 100 50" xmlns="http://www.w3.org/2000/svg" width="60px">
                                            <path d="M 0,49 L  10,49  20,49  30,12 40,5 50,10 60,0 70,15 80,43 90,49 100,49 "
                                                  fill="transparent" stroke-width="2" stroke="red" />

[2.14150]

[2.14654]

                                <div class="d-flex flex-column justify-content-between text-center ms-3">
                                    <div style="width:250px" class="py-3 my-auto">
                                        <div class="spinner-border ms-3 loading" class:d-none={!pvgis_loading}></div>
                                        <svg class:d-none={pvgis_loading || !maxProd} viewBox="-10 0 270 {maxProd}" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" width="250px" height="100px">
                                            {#each prodWeekly as p, i}
                                                <path d="M {i*5}, {maxProd} L {i*5}, {maxProd-p}" fill="transparent" stroke-width="2" stroke="#ffbf00" />
                                            {/each}

Insertion in grain/src/routes/projet/[id]/+page.svelte at line 457 [3.804604]

[2.14701]

                                        <svg class="donnee" class:d-none={pvgis_loading || maxProd} xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" viewBox="0 0 16 16">
                                            <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278"/>
                                        </svg>

Replacement in grain/src/routes/projet/[id]/+page.svelte at line 462 [3.804604]

B:BD[2.14744] → [2.14744:14822]

                                    <div>Puissance moyenne quotidienne </div>

[2.14744]

[2.14822]

                                    <div>Production annuelle</div>

Branchement du simulateur sur la synthèse

Dependencies

In channels

Change contents

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 11 [3.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 19 [3.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 159 [3.784923]

Replacement in grain/src/routes/projet/[id]/Simulation.svelte at line 246 [3.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 251 [3.784923]

Insertion in grain/src/routes/projet/[id]/Simulation.svelte at line 262 [3.784923]