Diffusion symkit 2040d62d485f

Alpha ajustments (I), some urgent fixes are needed. Mergin from ancarola…
2040d62d485f
Actions

Authored by ancarola on Apr 29 2018, 14:03.

Description

Alpha ajustments (I), some urgent fixes are needed. Mergin from ancarola, obtainment of beta

Details

Committed

ancarola

Apr 29 2018, 14:03

Pushed

ancarola

Apr 29 2018, 14:03

Parents

rSYMKIT962c3be6355e: journal fix
rSYMKITeb6a20960580: Beta added

Branches

Unknown

Tags

Unknown

Event Timeline

ancarola committed rSYMKIT2040d62d485f: Alpha ajustments (I), some urgent fixes are needed. Mergin from ancarola… (authored by ancarola).Apr 29 2018, 14:03

Merged Changes

Commit	Author	Details	Committed
eb6a20960580	ancarola	Beta added	Apr 29 2018
cb847ad6d602	Cincotti	Era giusto un commento sbagliato	Apr 28 2018
84dc7befb6d2	Cincotti	boh	Apr 28 2018
54741e94eb32	Cincotti	Corrigé formule evolve et formule energie pour un pendule couple, classe…	Apr 28 2018
4ed438590490	Cincotti	Mi sono permesso di aggiungere energy a pendulecoupl per fare qualche controllo…	Apr 26 2018
f8379a2b722a	ancarola	complete previous commit	Apr 25 2018
61f133b3e1fe	ancarola	Coupled pendule conception changed All old files are into the templates…	Apr 25 2018
d4c0fc865c99	ancarola	Scene conception improved: extends SceneWrapper	Apr 24 2018
efa85b8c289b	ancarola	ActorGroup	Apr 24 2018
6d50deac51be	ancarola	SceneWrapper add on	Apr 24 2018

Changes (101)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		alpha/alpha.pro
P		alpha/alphascene.cpp Copied to beta/betascene.cpp
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec.cpp
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec.h
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec1.cpp
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec1.h
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec2.cpp
V		{alpha/descriptors → templates/pendule_couple_old}/pendulec2.h
P		alpha/descriptors/pendules.cpp Deleted after being copied to multiple locations: alpha/pendules/pendules.cpp beta/pendules/pendules.cpp
P		alpha/descriptors/pendules.h Deleted after being copied to multiple locations: alpha/pendules/pendules.h beta/pendules/pendules.h
P		alpha/descriptors/ressort.cpp Deleted after being copied to multiple locations: alpha/ressort/ressort.cpp beta/ressort/ressort.cpp
P		alpha/descriptors/ressort.h Deleted after being copied to multiple locations: alpha/ressort/ressort.h beta/ressort/ressort.h
A	(dir)	alpha/newtonsphere/
P		alpha/newtonsphere.cpp Deleted after being copied to multiple locations: alpha/newtonsphere/newtonsphere.cpp beta/newtonsphere/newtonsphere.cpp
P		alpha/newtonsphere.h Deleted after being copied to multiple locations: alpha/newtonsphere/newtonsphere.h beta/newtonsphere/newtonsphere.h
P		alpha/newtonsphere/newtonsphere.cpp Copied from alpha/newtonsphere.cpp
P		alpha/newtonsphere/newtonsphere.h Copied from alpha/newtonsphere.h
A	(dir)	alpha/pendcouple/
A		alpha/pendcouple/pendcouple.cpp
A		alpha/pendcouple/pendcouple.h
A		alpha/pendcouple/pendsphere.cpp
A		alpha/pendcouple/pendsphere.h
P		alpha/pendcouple/pendulecoupl.cpp Copied from alpha/pendulecoupl.cpp
P		alpha/pendcouple/pendulecoupl.h Copied from alpha/pendulecoupl.h
A		alpha/pendcouple/penduledesc.cpp
A		alpha/pendcouple/penduledesc.h
P		alpha/pendule.cpp Deleted after being copied to multiple locations: alpha/pendules/pendule.cpp beta/pendules/pendule.cpp
P		alpha/pendule.h Deleted after being copied to multiple locations: alpha/pendules/pendule.h beta/pendules/pendule.h
P		alpha/pendulecoupl.cpp Deleted after being copied to multiple locations: alpha/pendcouple/pendulecoupl.cpp templates/pendule_couple_old/pendulecoupl.cpp
P		alpha/pendulecoupl.h Deleted after being copied to multiple locations: alpha/pendcouple/pendulecoupl.h templates/pendule_couple_old/pendulecoupl.h
A	(dir)	alpha/pendules/
P		alpha/pendules/pendule.cpp Copied from alpha/pendule.cpp
P		alpha/pendules/pendule.h Copied from alpha/pendule.h
P		alpha/pendules/pendules.cpp Copied from alpha/descriptors/pendules.cpp
P		alpha/pendules/pendules.h Copied from alpha/descriptors/pendules.h
P		alpha/ressor.cpp Deleted after being copied to multiple locations: alpha/ressort/ressor.cpp beta/ressort/ressor.cpp
P		alpha/ressor.h Deleted after being copied to multiple locations: alpha/ressort/ressor.h beta/ressort/ressor.h
A	(dir)	alpha/ressort/
P		alpha/ressort/ressor.cpp Copied from alpha/ressor.cpp
P		alpha/ressort/ressor.h Copied from alpha/ressor.h
P		alpha/ressort/ressort.cpp Copied from alpha/descriptors/ressort.cpp
P		alpha/ressort/ressort.h Copied from alpha/descriptors/ressort.h
A	(dir)	beta/
P		beta/assets.cpp Copied from alpha/assets.cpp
P		beta/assets.h Copied from alpha/assets.h
A		beta/beta.pro
P		beta/betascene.cpp Copied from alpha/alphascene.cpp
P		beta/betascene.h Copied from alpha/alphascene.h
P		beta/main.cpp Copied from alpha/main.cpp
P		beta/marbled.cpp Copied from alpha/marbled.cpp
P		beta/marbled.h Copied from alpha/marbled.h
A	(dir)	beta/newtonsphere/
V		{beta/newtonsphere ← alpha}/newtonsphere.cpp
V		{beta/newtonsphere ← alpha}/newtonsphere.h
A	(dir)	beta/pendcouple/
A		beta/pendcouple/pendcouple.cpp
A		beta/pendcouple/pendcouple.h
A		beta/pendcouple/pendsphere.cpp
A		beta/pendcouple/pendsphere.h
A		beta/pendcouple/penduledesc.cpp
A		beta/pendcouple/penduledesc.h
A	(dir)	beta/pendules/
V		{beta/pendules ← alpha}/pendule.cpp
V		{beta/pendules ← alpha}/pendule.h
V		{beta/pendules ← alpha/descriptors}/pendules.cpp
V		{beta/pendules ← alpha/descriptors}/pendules.h
A	(dir)	beta/ressort/
V		{beta/ressort ← alpha}/ressor.cpp
V		{beta/ressort ← alpha}/ressor.h
V		{beta/ressort ← alpha/descriptors}/ressort.cpp
V		{beta/ressort ← alpha/descriptors}/ressort.h
A		doc/projetInfoMAPH2018.pdf
M		symath/descriptors/oscillateur.h
A		symath/descriptors/oscillateursimple.h
M		symath/integrators.h
M		symath/symath.pro
A		symgraph/actors/actorgroup.cpp
A		symgraph/actors/actorgroup.h
M		symgraph/actors/particles/oscillatorparticle.cpp
M		symgraph/actors/particles/oscillatorparticle.h
A		symgraph/actors/symsystem.cpp
A		symgraph/actors/symsystem.h
M		symgraph/scene.cpp
M		symgraph/scene.h
A		symgraph/scenewrapper.cpp
A		symgraph/scenewrapper.h
M		symgraph/sktools.cpp
M		symgraph/sktools.h
M		symgraph/symgraph.pro
M		symkit.pro
A	(dir)	templates/pendule_couple_old/
P		templates/pendule_couple_old/pendparticle.cpp Copied from alpha/pendparticle.cpp
P		templates/pendule_couple_old/pendparticle.h Copied from alpha/pendparticle.h
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec.cpp
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec.h
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec1.cpp
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec1.h
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec2.cpp
V		{templates/pendule_couple_old ← alpha/descriptors}/pendulec2.h
V		{templates/pendule_couple_old ← alpha}/pendulecoupl.cpp
V		{templates/pendule_couple_old ← alpha}/pendulecoupl.h