pmeunier/grain - Change 64D3E3ZOPPF3UFDFYWGBCKS5NTBR34J27FGESDZSSYMUEPD5ZMLQC

Séparation de helpers et common, pour typer plus facilement

Created by pmeunier on January 3, 2024

64D3E3ZOPPF3UFDFYWGBCKS5NTBR34J27FGESDZSSYMUEPD5ZMLQC

Dependencies

In channels

main

Change contents

Replacement in tsconfig.json at line 5 [4.29953]
B:BD[3.24889] → [3.24889:24914]
```
        "checkJs": true,
```
[3.24889]
[3.24914]
```
        "checkJs": false,
```

Replacement in src/routes/apropos/+page.svelte at line 12 [5.37]

B:BD[5.143] → [3.111006:111045]

    <Donnees donnees={data.donnees} />

[5.143]

[6.717]

    {#if data.donnees}
        <Donnees donnees={data.donnees} />
    {/if}

Deletion in src/routes/apropos/+page.svelte at line 47 [5.37]
B:BD[5.950] → [3.112742:112743]
∅:D[3.112743] → [5.2344:2364]
B:BD[5.2344] → [5.2344:2364]
B:BD[5.2364] → [3.112744:112819]
∅:D[3.112819] → [5.2496:2505]
B:BD[5.2496] → [5.2496:2505]
```
<style lang="scss">
    .g {
        color: $gp-3;
    }
    .ra {
        color: $gp-2;
    }
</style>
```
Replacement in src/routes/apropos/+page.server.ts at line 5 [6.2103]
B:BD[2.1628361] → [2.1628361:1628403]
```
    return { email: 'grain@coturnix.fr' }
```
[2.1628361]
[6.2782]
```
    return { email: 'grain@coturnix.fr', donnees: null }
```
Insertion in src/helpers.ts at line 12 [4.858205]
[4.858414]
[4.858414]
```
export * from './common'
```

Deletion in src/helpers.ts at line 144 [4.858205]

B:BD[7.6958] → [7.6958:7087]

B:BD[7.7087] → [3.138036:138166]

    }
}
export function coutElec(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout +=
            p.coutElec *
            Math.pow(1 + p.inflationElec / 100, i) *
            consoMoyenneFoyer(p, i)

Deletion in src/helpers.ts at line 145 [4.858205]
B:BD[7.7188] → [7.7188:7204]
```
    return cout
```

Deletion in src/helpers.ts at line 146 [4.858205]

B:BD[7.7206] → [7.7206:7331]

B:BD[7.7331] → [3.138167:138444]

∅:D[3.138444] → [7.7528:7624]

B:BD[7.7528] → [7.7528:7624]

B:BD[7.7624] → [3.138445:138500]

∅:D[3.138500] → [7.7675:7678]

B:BD[7.7675] → [7.7675:7678]

B:BD[7.7678] → [3.138501:138658]

∅:D[7.7832] → [8.2144:2146]

∅:D[3.138658] → [8.2144:2146]

B:BD[8.2144] → [8.2144:2146]

B:BD[8.2146] → [7.7833:7912]

B:BD[7.7912] → [3.138659:138739]

∅:D[3.138739] → [7.7990:7992]

B:BD[7.7990] → [7.7990:7992]


export function coutElecAuto(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout +=
            (tarifLocal(p, i) * consoMoyenneFoyer(p, i) * p.autoprod) / 100 +
            (p.coutElec *
                Math.pow(1 + p.inflationElec / 100, i) *
                consoMoyenneFoyer(p, i) *
                (100 - p.autoprod)) /
                100
    }
    return cout
}
export function tarifLocal(p: Grain.SimulationCommunaute, i: number) {
    return p.prix * Math.pow(1 + p.inflation / 100, i)
}
export function productionAnnuelle(p: Grain.SimulationCommunaute, i: number) {
    return p.productible * p.puissance * Math.pow(1 - p.degradation / 100, i)
}
export function consoMoyenneFoyer(p: Grain.SimulationCommunaute, i: number) {
    return Math.min(p.consoMoyenneFoyer, productionAnnuelle(p, i) / p.autoprod)
}

File addition: common.ts (----------)

[4.762577]

import type { Grain } from './grain-types'
export { Grain } from './grain-types'
export function coutElec(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout +=
            p.coutElec *
            Math.pow(1 + p.inflationElec / 100, i) *
            consoMoyenneFoyer(p, i)
    }
    return cout
}
export function coutElecAuto(p: Grain.SimulationCommunaute, N: number) {
    let cout = 0
    for (let i = 0; i < N; i++) {
        cout +=
            (tarifLocal(p, i) * consoMoyenneFoyer(p, i) * p.autoprod) / 100 +
            (p.coutElec *
                Math.pow(1 + p.inflationElec / 100, i) *
                consoMoyenneFoyer(p, i) *
                (100 - p.autoprod)) /
                100
    }
    return cout
}
export function tarifLocal(p: Grain.SimulationCommunaute, i: number) {
    return p.prix * Math.pow(1 + p.inflation / 100, i)
}
export function productionAnnuelle(p: Grain.SimulationCommunaute, i: number) {
    return p.productible * p.puissance * Math.pow(1 - p.degradation / 100, i)
}
export function consoMoyenneFoyer(p: Grain.SimulationCommunaute, i: number) {
    return Math.min(p.consoMoyenneFoyer, productionAnnuelle(p, i) / p.autoprod)
}

Insertion in package.json at line 9 [4.868575]

[3.141259]

        "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

Séparation de helpers et common, pour typer plus facilement

Dependencies

In channels

Change contents

Replacement in tsconfig.json at line 5 [4.29953]

Replacement in src/routes/apropos/+page.svelte at line 12 [5.37]

Deletion in src/routes/apropos/+page.svelte at line 47 [5.37]

Replacement in src/routes/apropos/+page.server.ts at line 5 [6.2103]

Insertion in src/helpers.ts at line 12 [4.858205]

Deletion in src/helpers.ts at line 144 [4.858205]

Deletion in src/helpers.ts at line 145 [4.858205]

Deletion in src/helpers.ts at line 146 [4.858205]

File addition: common.ts (----------)

Insertion in package.json at line 9 [4.868575]