cvs commit: gump/python/gump/model depend.py property.py

[ajack]

ajack   2004/03/28 13:09:26

  Modified:python/gump/model depend.py property.py
  Log:
  I can't reproduce this locally (with the unit test workspace) nor unit tests.

  So, reverting to an earleir try & digging in remotely.
  
  Revision  ChangesPath
  1.24  +0 -2  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- depend.py 28 Mar 2004 19:04:55 -  1.23
  +++ depend.py 28 Mar 2004 21:09:26 -  1.24
  @@ -20,8 +20,6 @@
   
   from gump.model.state import *
   from gump.model.object import NamedModelObject
  -from gump.model.property import Property
  -
   
   from gump.utils.note import *
   from gump.utils import getIndent
  
  
  
  1.18  +6 -2  gump/python/gump/model/property.py
  
  Index: property.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/property.py,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- property.py   28 Mar 2004 20:45:03 -  1.17
  +++ property.py   28 Mar 2004 21:09:26 -  1.18
  @@ -159,11 +159,11 @@
   return self.properties.values()
   
   def importProperty(self,xmlproperty):
  -self.addProperty(Property(xmlproperty,self.getOwner()))
  +self.addProperty(Property(xmlproperty,self))
   
   def completeProperties(self,workspace):   
   for property in self.getProperties(): 
  -property.complete(self.getOwner(),workspace)
  +property.complete(self,workspace)
   
   def dump(self, indent=0, output=sys.stdout):
   """ Display the properties """
  @@ -203,6 +203,7 @@
   self.sysproperties.importProperty(xmlproperty)
   
   def importProperties(self,xml):
  +""" Import all properties (from XML to model). """
   if xml.property:
   for xmlproperty in xml.property:
   self.importProperty(xmlproperty)
  @@ -212,7 +213,10 @@
   self.importSysProperty(xmlproperty)
   
   def completeProperties(self,workspace=None):
  +# The only entity not to pass the workspace,
  +# can be the workspace itself.
   if not workspace: workspace=self
  +# Import normal and system
   self.properties.completeProperties(workspace)
   self.sysproperties.completeProperties(workspace)
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/28 11:04:55

  Modified:python/gump/document forrest.py
   python/gump/model depend.py
  Log:
  Attempt to implement 

cvs commit: gump/python/gump/model depend.py ant.py rawmodel.py

[ajack]

ajack   2004/03/15 14:07:08

  Modified:python/gump/utils note.py launcher.py http.py owner.py
sync.py work.py __init__.py xmlutils.py tools.py
file.py commandLine.py
   python/gump/results resulter.py __init__.py model.py
loader.py
   python/gump update.py gumprun.py engine.py build.py
integrate.py check.py config.py continuous.py
   python/gump/output nag.py repository.py xref.py __init__.py
statsdb.py
   python/gump/test maven.py model.py
   python/gump/test/resources/full1 module5.xml module4.xml
workspace.xml
   python/gump/tool stats.py
   python/gump/document forrest.py
   python/gump/model depend.py ant.py rawmodel.py
  Added:   python/gump/test/resources/full1 .cvsignore
  Log:
  1) Some comment tweaks (primarily moving to license 2.0, more to do)

  2) Moving towards http://cvs.apache.org/viewcvs/gump/python/gump/utils/note.py.diff?r1=1.6&r2=1.7
  
  
  1.16  +13 -57gump/python/gump/utils/launcher.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/launcher.py.diff?r1=1.15&r2=1.16
  
  
  1.7   +13 -74gump/python/gump/utils/http.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/http.py.diff?r1=1.6&r2=1.7
  
  
  1.4   +13 -56gump/python/gump/utils/owner.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/owner.py.diff?r1=1.3&r2=1.4
  
  
  1.7   +13 -56gump/python/gump/utils/sync.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/sync.py.diff?r1=1.6&r2=1.7
  
  
  1.13  +12 -56gump/python/gump/utils/work.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/work.py.diff?r1=1.12&r2=1.13
  
  
  1.26  +14 -56gump/python/gump/utils/__init__.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/__init__.py.diff?r1=1.25&r2=1.26
  
  
  1.10  +12 -56gump/python/gump/utils/xmlutils.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/xmlutils.py.diff?r1=1.9&r2=1.10
  
  
  1.20  +12 -56gump/python/gump/utils/tools.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/tools.py.diff?r1=1.19&r2=1.20
  
  
  1.8   +14 -57gump/python/gump/utils/file.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/utils/file.py.diff?r1=1.7&r2=1.8
  
  
  1.10  +15 -58gump/python/gump/utils/commandLine.py
  
  
http://cvs.apache.org/viewcvs/gump/python/gump/utils/commandLine.py.diff?r1=1.9&r2=1.10
  
  
  1.17  +13 -56gump/python/gump/results/resulter.py
  
  
http://cvs.apache.org/viewcvs/gump/python/gump/results/resulter.py.diff?r1=1.16&r2=1.17
  
  
  1.4   +14 -56gump/python/gump/results/__init__.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/results/__init__.py.diff?r1=1.3&r2=1.4
  
  
  1.7   +13 -56gump/python/gump/results/model.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/results/model.py.diff?r1=1.6&r2=1.7
  
  
  1.5   +13 -56gump/python/gump/results/loader.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/results/loader.py.diff?r1=1.4&r2=1.5
  
  
  1.24  +20 -23gump/python/gump/update.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/update.py.diff?r1=1.23&r2=1.24
  
  
  1.13  +16 -2 gump/python/gump/gumprun.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/gumprun.py.diff?r1=1.12&r2=1.13
  
  
  1.86  +1 -2  gump/python/gump/engine.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/engine.py.diff?r1=1.85&r2=1.86
  
  
  1.43  +24 -31gump/python/gump/build.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/build.py.diff?r1=1.42&r2=1.43
  
  
  1.23  +16 -67gump/python/gump/integrate.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/integrate.py.diff?r1=1.22&r2=1.23
  
  
  1.39  +20 -79gump/python/gump/check.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/check.py.diff?r1=1.38&r2=1.39
  
  
  1.16  +12 -56gump/python/gump/config.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/config.py.diff?r1=1.15&r2=1.16
  
  
  1.4   +17 -20gump/python/gump/continuous.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/continuous.py.diff?r1=1.3&r2=1.4
  
  
  1.28  +21 -60gump/python/gump/output/nag.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/output/nag.py.diff?r1=1.27&r2=1.28
  
  
  1.5   +12 -58gump/python/gump/output/repository.py
  
  
http://cvs.apache.org/viewcvs/gump/python/gump/output/repository.py.diff?r1=1.4&r2=1.5
  
  
  1.11  +13 -59gump/python/gump/output/xref.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/output/xref.py.diff?r1=1.10&r2=1.11
  
  
  1.5   +12 -57gump/python/gump/output/__init__.py
  
  http://cvs.apache.org/viewcvs/gump/python/gump/output/__init__.py.diff?r1=1.4&r2=1.5
  
  
  1.17  +12 

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/10 12:28:36

  Modified:python/gump/model depend.py
  Log:
  Adding depend when it ought have been subdepend.
  
  Revision  ChangesPath
  1.16  +6 -6  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- depend.py 10 Mar 2004 14:20:04 -  1.15
  +++ depend.py 10 Mar 2004 20:28:36 -  1.16
  @@ -300,8 +300,8 @@
   if not self.fullDependencies.containsProject(dependProject):
   # Get Sub Dependencies
   for subdepend in dependProject.getFullDependencies():
  -if not self.fullDependencies.containsDepend(subdepend):
  -self.fullDependencies.addDepend(depend)
  +if not self.fullDependencies.containsDepend(subdepend):   
  +self.fullDependencies.addDepend(subdepend)
   
   self.fullDependencies.addDepend(depend)
   
  @@ -339,7 +339,7 @@
   # Get Sub Dependees
   for subdepend in dependProject.getFullDependees():
   if not self.fullDependees.containsDepend(subdepend):
  -self.fullDependees.addDepend(depend)
  +self.fullDependees.addDepend(subdepend)
 
   self.fullDependees.addDepend(depend)
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/10 06:20:06

  Modified:python/gump/model depend.py
  Log:
  I'd over optimized full dependency determination, hence full == direct depends,

  hence these numbers are too low:

  

  http://lsd.student.utwente.nl/gump/project_todos.html
  
  Revision  ChangesPath
  1.15  +8 -6  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- depend.py 9 Mar 2004 21:19:09 -   1.14
  +++ depend.py 10 Mar 2004 14:20:04 -  1.15
  @@ -295,7 +295,6 @@
   self.fullDependencies=DependSet()
   for depend in self.directDependencies.getDepends():
   if not self.fullDependencies.containsDepend(depend):
  -self.fullDependencies.addDepend(depend)
   
   dependProject=depend.getProject()
   if not self.fullDependencies.containsProject(dependProject):
  @@ -303,6 +302,8 @@
   for subdepend in dependProject.getFullDependencies():
   if not self.fullDependencies.containsDepend(subdepend):
   self.fullDependencies.addDepend(depend)
  +
  +self.fullDependencies.addDepend(depend)
   
   return self.fullDependencies.getDepends()
   
  @@ -331,8 +332,7 @@
   self.fullDependees=DependSet(1)
   
   for depend in self.directDependees.getDepends():
  -if not self.fullDependees.containsDepend(depend):
  -self.fullDependees.addDepend(depend)
  +if not self.fullDependees.containsDepend(depend):  
   
   dependProject=depend.getOwnerProject()
   if not self.fullDependees.containsProject(dependProject):
  @@ -340,6 +340,8 @@
   for subdepend in dependProject.getFullDependees():
   if not self.fullDependees.containsDepend(subdepend):
   self.fullDependees.addDepend(depend)
  +  
  +self.fullDependees.addDepend(depend)
   
   return self.fullDependees.getDepends()
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/09 13:19:09

  Modified:python/gump/model depend.py
  Log:
  Dare I say it? Last commit for a while [I can dream..]
  
  Revision  ChangesPath
  1.14  +4 -4  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- depend.py 9 Mar 2004 21:08:52 -   1.13
  +++ depend.py 9 Mar 2004 21:19:09 -   1.14
  @@ -311,7 +311,7 @@
   
   def getFullDependencyCount(self):
   self.getFullDependencies()
  -return fullDependencies.getUniqueProjectDependCount()
  +return self.fullDependencies.getUniqueProjectDependCount()
   
   #
   # Dependees
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/09 13:08:52

  Modified:python/gump/model depend.py
  Log:
  I'm close, honest...
  
  Revision  ChangesPath
  1.13  +7 -5  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- depend.py 9 Mar 2004 21:03:05 -   1.12
  +++ depend.py 9 Mar 2004 21:08:52 -   1.13
  @@ -310,7 +310,8 @@
   return self.directDependencies.getUniqueProjectDependCount()
   
   def getFullDependencyCount(self):
  -return self.getFullDependencies().getUniqueProjectDependCount()
  +self.getFullDependencies()
  +return fullDependencies.getUniqueProjectDependCount()
   
   #
   # Dependees
  @@ -346,7 +347,8 @@
   return self.directDependees.getUniqueProjectDependCount()
   
   def getFullDependeeCount(self):
  -return self.getFullDependees().getUniqueProjectDependCount()
  +self.getFullDependees()
  +return self.fullDependees.getUniqueProjectDependCount()
   
   
   def buildDependenciesMap(self,workspace):
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/09 13:03:05

  Modified:python/gump/model depend.py
  Log:
  If at N you don't succeed...
  
  Revision  ChangesPath
  1.12  +5 -5  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- depend.py 9 Mar 2004 20:57:42 -   1.11
  +++ depend.py 9 Mar 2004 21:03:05 -   1.12
  @@ -310,7 +310,7 @@
   return self.directDependencies.getUniqueProjectDependCount()
   
   def getFullDependencyCount(self):
  -return self.fullDependencies.getUniqueProjectDependCount()
  +return self.getFullDependencies().getUniqueProjectDependCount()
   
   #
   # Dependees
  @@ -346,7 +346,7 @@
   return self.directDependees.getUniqueProjectDependCount()
   
   def getFullDependeeCount(self):
  -return self.fullDependees.getUniqueProjectDependCount()
  +return self.getFullDependees().getUniqueProjectDependCount()
   
   
   def buildDependenciesMap(self,workspace):
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/09 12:57:42

  Modified:python/gump/model depend.py
  Log:
  Keep trying...
  
  Revision  ChangesPath
  1.11  +6 -5  gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- depend.py 9 Mar 2004 20:40:29 -   1.10
  +++ depend.py 9 Mar 2004 20:57:42 -   1.11
  @@ -292,7 +292,7 @@
   #
   # Build (once) upon demand
   #
  -self.fullDependencies=DependSet(1)
  +self.fullDependencies=DependSet()
   for depend in self.directDependencies.getDepends():
   if not self.fullDependencies.containsDepend(depend):
   self.fullDependencies.addDepend(depend)
  @@ -327,7 +327,8 @@
   #
   # Build (once) upon demand
   #
  -self.fullDependees=DependSet()
  +self.fullDependees=DependSet(1)
  +
   for depend in self.directDependees.getDepends():
   if not self.fullDependees.containsDepend(depend):
   self.fullDependees.addDepend(depend)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: gump/python/gump/model depend.py

[ajack]

ajack   2004/03/09 12:40:29

  Modified:python/gump/model depend.py
  Log:
  Optimization (attempts)/Fixes.
  
  Revision  ChangesPath
  1.10  +23 -14gump/python/gump/model/depend.py
  
  Index: depend.py
  ===
  RCS file: /home/cvs/gump/python/gump/model/depend.py,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- depend.py 9 Mar 2004 19:57:06 -   1.9
  +++ depend.py 9 Mar 2004 20:40:29 -   1.10
  @@ -245,7 +245,7 @@
   #
   dependProject=None
   if self.dependees:
  -dependPRoejct = depend.getOwnerProject()
  +dependProject = depend.getOwnerProject()
   else:
   dependProject = depend.getProject()
   if not self.projectMap.has_key(dependProject):
  @@ -255,6 +255,9 @@
   def containsDepend(self, depend):
   return (depend in self.depends)
   
  +def containsProject(self, project):
  +return self.projectMap.has_key(project)
  +
   def getDepends(self):
   return self.depends
   
  @@ -271,7 +274,7 @@
   self.fullDependencies=None
   
   # Direct & Full Dependees
  -self.directDependees=DependSet()
  +self.directDependees=DependSet(1)
   self.fullDependees=None
   
   #
  @@ -289,14 +292,17 @@
   #
   # Build (once) upon demand
   #
  -self.fullDependencies=DependSet()
  +self.fullDependencies=DependSet(1)
   for depend in self.directDependencies.getDepends():
   if not self.fullDependencies.containsDepend(depend):
   self.fullDependencies.addDepend(depend)
  -# Get Sub Dependencies
  -for subdepend in depend.getProject().getFullDependencies():
  -if not self.fullDependencies.containsDepend(subdepend):
  -self.fullDependencies.addDepend(depend)
  +
  +dependProject=depend.getProject()
  +if not self.fullDependencies.containsProject(dependProject):
  +# Get Sub Dependencies
  +for subdepend in dependProject.getFullDependencies():
  +if not self.fullDependencies.containsDepend(subdepend):
  +self.fullDependencies.addDepend(depend)
   
   return self.fullDependencies.getDepends()
   
  @@ -325,10 +331,13 @@
   for depend in self.directDependees.getDepends():
   if not self.fullDependees.containsDepend(depend):
   self.fullDependees.addDepend(depend)
  -# Get Sub Dependees
  -for subdepend in depend.getProject().getFullDependees():
  -if not self.fullDependees.containsDepend(subdepend):
  -self.fullDependees.addDepend(depend)
  +
  +dependProject=depend.getOwnerProject()
  +if not self.fullDependees.containsProject(dependProject):
  +# Get Sub Dependees
  +for subdepend in dependProject.getFullDependees():
  +if not self.fullDependees.containsDepend(subdepend):
  +self.fullDependees.addDepend(depend)
   
   return self.fullDependees.getDepends()
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]