Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonMarechal25 committed Jun 28, 2024
1 parent cda3059 commit 0723e9d
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions src/solver/optimisation/opt_optimisation_lineaire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ void runThermalHeuristic(PROBLEME_HEBDO* problemeHebdo)
}
}


void resizeProbleme(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
unsigned nombreDeVariables,
unsigned nombreDeContraintes)
Expand Down Expand Up @@ -191,34 +190,6 @@ void resizeProbleme(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
}
} // namespace

void resizeProbleme(PROBLEME_ANTARES_A_RESOUDRE* ProblemeAResoudre,
unsigned nombreDeVariables,
unsigned nombreDeContraintes)
{
ProblemeAResoudre->CoutQuadratique.resize(nombreDeVariables);
ProblemeAResoudre->CoutLineaire.resize(nombreDeVariables);
ProblemeAResoudre->TypeDeVariable.resize(nombreDeVariables);
ProblemeAResoudre->Xmin.resize(nombreDeVariables);
ProblemeAResoudre->Xmax.resize(nombreDeVariables);
ProblemeAResoudre->X.resize(nombreDeVariables);
ProblemeAResoudre->AdresseOuPlacerLaValeurDesVariablesOptimisees.resize(nombreDeVariables);
ProblemeAResoudre->AdresseOuPlacerLaValeurDesCoutsReduits.resize(nombreDeVariables);
ProblemeAResoudre->PositionDeLaVariable.resize(nombreDeVariables);
ProblemeAResoudre->Pi.resize(nombreDeVariables);
ProblemeAResoudre->Colonne.resize(nombreDeVariables);
ProblemeAResoudre->NomDesVariables.resize(nombreDeVariables);
ProblemeAResoudre->VariablesEntieres.resize(nombreDeVariables);

ProblemeAResoudre->Sens.resize(nombreDeContraintes);
ProblemeAResoudre->IndicesDebutDeLigne.resize(nombreDeContraintes);
ProblemeAResoudre->NombreDeTermesDesLignes.resize(nombreDeContraintes);
ProblemeAResoudre->SecondMembre.resize(nombreDeContraintes);
ProblemeAResoudre->AdresseOuPlacerLaValeurDesCoutsMarginaux.resize(nombreDeContraintes);
ProblemeAResoudre->CoutsMarginauxDesContraintes.resize(nombreDeContraintes);
ProblemeAResoudre->ComplementDeLaBase.resize(nombreDeContraintes);
ProblemeAResoudre->NomDesContraintes.resize(nombreDeContraintes);
}

bool OPT_OptimisationLineaire(const OptimizationOptions& options,
PROBLEME_HEBDO* problemeHebdo,
const AdqPatchParams& adqPatchParams,
Expand Down

0 comments on commit 0723e9d

Please sign in to comment.