Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 24 additions & 60 deletions nbproject/build-impl.xml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
build.xml.data.CRC32=c399fd42
build.xml.data.CRC32=aad47bb9
build.xml.script.CRC32=fc61a0c9
build.xml.stylesheet.CRC32=8064a381@1.79.1.48
build.xml.stylesheet.CRC32=8064a381@1.75.2.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c399fd42
nbproject/build-impl.xml.script.CRC32=e1daa8b7
nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
nbproject/build-impl.xml.data.CRC32=aad47bb9
nbproject/build-impl.xml.script.CRC32=0563b4be
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
Empty file.
6 changes: 5 additions & 1 deletion nbproject/private/private.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
compile.on.save=true
user.properties.file=C:\\Users\\guilhermeferreira\\AppData\\Roaming\\NetBeans\\8.1\\build.properties
do.depend=false
do.jar=true
javac.debug=true
javadoc.preview=true
user.properties.file=C:\\Users\\Nicole\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
6 changes: 6 additions & 0 deletions nbproject/private/private.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/>
</open-files>
</project-private>
6 changes: 4 additions & 2 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=UniversityTimeTableScheduling
application.vendor=Nicole
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
Expand All @@ -26,6 +27,7 @@ dist.archive.excludes=
dist.dir=dist
dist.jar=${dist.dir}/UniversityTimeTableScheduling.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
includes=**
jar.compress=false
Expand Down Expand Up @@ -58,7 +60,7 @@ main.class=
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=JDK_1.8
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
Expand Down
1 change: 0 additions & 1 deletion nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>UniversityTimeTableScheduling</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
Expand Down
70 changes: 69 additions & 1 deletion src/package1/Individuo.java
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,74 @@ public void alocar(Gene gene, int timeSlot, int codigoPeriodo){
}



public int funcaoFitness (Individuo individuo) {
int nota = 9500;

int pesoLacunasVazias = 1;
int pesoAlunosNaoMatriculados = 1;
int pesoProfessorOscioso = 1;
int pesoMateriaNaoAlocada = 1;

int lacunasVazias = verificaLacunasVazias(individuo);
int alunosNaoMatriculados = verificaAlunosNaoMatriculados();
int professoresOsciosos = verificaProfessoresOsciosos(ld.Professores);
int materiasNaoAlocadas = verificaMateriasNaoAlocadas(ld.Estudantes);

nota = nota - pesoLacunasVazias*lacunasVazias - pesoAlunosNaoMatriculados*alunosNaoMatriculados
- pesoProfessorOscioso*professoresOsciosos - pesoMateriaNaoAlocada*materiasNaoAlocadas ;


return nota;

}

private int verificaLacunasVazias(Individuo individuo ) {
int lacunas = 0;

for (int i = 0; i < individuo.qtdPeriodos; i++){
for(int j = 0; j < individuo.qtdTimeSlots; j++){
if(individuo.horario[j][i] == null){
lacunas++;

}
}
}

return lacunas;
}

private int verificaAlunosNaoMatriculados(List<Estudante> estudantes) {
int alunos = 0;
int disciplinas = 0;

for(Estudante p : estudantes){
for(Disciplina d : p.disciplinasACursar ){
if(!p.disciplinasCursadas.contains(d))
disciplinas++;
}
if(disciplinas == p.disciplinasACursar.size()){
alunos++;
disciplinas = 0;
}


return alunos;
}

private int verificaProfessoresOsciosos(List<Professor> professores) {
int qtdProfessores = 0;

for(Professor p : professores){
if(p.TimeSlotsAlocados.isEmpty()){
qtdProfessores++;
}
}
return qtdProfessores;
}

private int verificaMateriasNaoAlocadas() {
int materias = 0;
return materias;
}

}