ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5843 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-03-26 18:43:33 +00:00
parent a1978f660a
commit 6111b9e8cb
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/poems/poemslist.h
View File

@ -62,15 +62,15 @@ public:
template<class T> ListElement<T>::ListElement(){ template<class T> ListElement<T>::ListElement(){
next = prev = 0; next = prev = 0;
value = 0; value = 0;
}; }
template<class T> ListElement<T>::ListElement(T* v){ template<class T> ListElement<T>::ListElement(T* v){
next = prev = 0; next = prev = 0;
value = v; value = v;
}; }
template<class T> ListElement<T>::~ListElement(){ template<class T> ListElement<T>::~ListElement(){
}; }
// //
// List // List
@ -79,33 +79,33 @@ template<class T> ListElement<T>::~ListElement(){
template<class S> List<S>::List(){ template<class S> List<S>::List(){
head = tail = 0; head = tail = 0;
numelements = 0; numelements = 0;
}; }
template<class S> List<S>::~List(){ template<class S> List<S>::~List(){
// delete all list elements // delete all list elements
while(numelements) while(numelements)
Remove(tail); Remove(tail);
}; }
template<class S> void List<S>::Append(List<S> * listToAppend) template<class S> void List<S>::Append(List<S> * listToAppend)
{ {
tail->next = listToAppend->head; tail->next = listToAppend->head;
listToAppend->head->prev = tail; listToAppend->head->prev = tail;
tail = listToAppend->tail; tail = listToAppend->tail;
}; }
template<class S> int List<S>::GetNumElements(){ template<class S> int List<S>::GetNumElements(){
return numelements; return numelements;
}; }
template<class S> ListElement<S>* List<S>::GetHeadElement(){ template<class S> ListElement<S>* List<S>::GetHeadElement(){
return head; return head;
}; }
template<class S> ListElement<S>* List<S>::GetTailElement(){ template<class S> ListElement<S>* List<S>::GetTailElement(){
return tail; return tail;
}; }
template<class S> void List<S>::Remove(ListElement<S>* ele){ template<class S> void List<S>::Remove(ListElement<S>* ele){
@ -131,7 +131,7 @@ template<class S> void List<S>::Remove(ListElement<S>* ele){
numelements--; numelements--;
if(ele) if(ele)
delete ele; delete ele;
}; }
template<class S> ListElement<S>* List<S>::Append(S* v){ template<class S> ListElement<S>* List<S>::Append(S* v){
if(!v){ if(!v){
@ -156,7 +156,7 @@ template<class S> ListElement<S>* List<S>::Append(S* v){
} }
return ele; return ele;
}; }
template<class S> ListElement<S>* List<S>::Prepend(S* v){ template<class S> ListElement<S>* List<S>::Prepend(S* v){
if(!v){ if(!v){
@ -175,7 +175,7 @@ template<class S> ListElement<S>* List<S>::Prepend(S* v){
ele->next->prev = ele; ele->next->prev = ele;
} }
return ele; return ele;
}; }
template<class S> S** List<S>::CreateArray(){ template<class S> S** List<S>::CreateArray(){
S** array = new S* [numelements]; S** array = new S* [numelements];
@ -186,7 +186,7 @@ template<class S> S** List<S>::CreateArray(){
ele = ele->next; ele = ele->next;
} }
return array; return array;
}; }
template<class S> S* List<S>::operator()(int id){ template<class S> S* List<S>::operator()(int id){
if(id >= numelements){ if(id >= numelements){
@ -200,18 +200,18 @@ template<class S> S* List<S>::operator()(int id){
} }
return ele->value; return ele->value;
}; }
template<class S> void List<S>::DeleteValues(){ template<class S> void List<S>::DeleteValues(){
while(numelements) while(numelements)
RemoveElementAndDeleteValue(tail); RemoveElementAndDeleteValue(tail);
}; }
template<class S> void List<S>::RemoveElementAndDeleteValue(ListElement<S>* ele){ template<class S> void List<S>::RemoveElementAndDeleteValue(ListElement<S>* ele){
S* v = ele->value; S* v = ele->value;
Remove(ele); Remove(ele);
delete v; delete v;
}; }
template<class S> void List<S>::PrintList(){ template<class S> void List<S>::PrintList(){
cout<<"Printing List "<<endl; cout<<"Printing List "<<endl;
@ -223,7 +223,7 @@ template<class S> void List<S>::PrintList(){
ele = ele->next; ele = ele->next;
} }
cout<<*(ele->value)<<endl; cout<<*(ele->value)<<endl;
}; }
#endif #endif

2
lib/poems/workspace.cpp
View File

@ -137,7 +137,7 @@ if(njoint){
array = new int[NodeValue->value->listOfNodes.GetNumElements()]; array = new int[NodeValue->value->listOfNodes.GetNumElements()];
arrayFromChain = NodeValue->value->listOfNodes.CreateArray(); arrayFromChain = NodeValue->value->listOfNodes.CreateArray();
numElementsInSystem = NodeValue->value->listOfNodes.GetNumElements(); numElementsInSystem = NodeValue->value->listOfNodes.GetNumElements();
for(int counter = 0; counter < numElementsInSystem; counter++){ for(counter = 0; counter < numElementsInSystem; counter++){
array[counter] = *arrayFromChain[counter]; array[counter] = *arrayFromChain[counter];
} }