1. A method of merging changes made to a baseline structured data file comprising:
beginning a first merge session by accessing an annotated structured data file;
reviewing, by a first user, at least one annotation within the annotated data file;
saving the annotated data file to create an incomplete merge file; and
closing the first merge session in response to the first user indicating the end the first merge session.
2. The method of claim 1 further comprising generating the annotated structured data file prior to beginning the first merge session.
3. The method of claim 2 wherein generating the annotated structured data file comprises:
executing a difference generator on a baseline structured data file, a first contributor structured data file, and a second contributor structured data file to generate a delta table and a conflict table;
copying the baseline structured data file; and
annotating the copy of the baseline structured data file to include each entry of the delta table and the conflict table.
4. The method of claim 1 further comprising transferring the incomplete merge file to the second user over a network.
5. The method of claim 4 further comprising beginning a second merge session by accessing the incomplete merge file and reviewing, by a second user, at least one annotation within the incomplete merge file.
6. A computer readable medium for merging changes made to a baseline structured data file, the computer readable medium comprising instructions to cause a processor to:
begin a first merge session by accessing an annotated structured data file;
provide for a review by a first user of at least one annotation within the annotated data file;
save the annotated data file to create an incomplete merge file; and
close the first merge session in response to the first user indicating the end the first merge session.
7. The computer readable medium of claim 6 further comprising instructions to generate the annotated structured data file prior to beginning the first merge session.
8. The computer readable medium of claim 7 wherein the instructions to generate the annotated structured data file comprises instructions to:
execute a difference generator on a baseline structured data file, a first contributor structured data file, and a second contributor structured data file to generate a delta table and a conflict table;
copy the baseline structured data file; and
annotate the copy of the baseline structured data file to include each entry of the delta table and the conflict table.
9. The computer readable medium of claim 6 further comprising instructions to transfer the incomplete merge file to the second user over a network.
10. The computer readable medium of claim 9 further comprising instructions to begin a second merge session by accessing the incomplete merge file and reviewing, by a second user, at least one annotation within the incomplete merge file.
11. A computer data signal embodied in a carrier wave for merging changes made to a baseline structured data file, the computer data signal comprising:
program code for beginning a first merge session by accessing an annotated structured data file;
program code for reviewing, by a first user, at least one annotation within the annotated data file;
program code for saving the annotated data file to create an incomplete merge file; and
program code for closing the first merge session in response to the first user indicating the end the first merge session.
12. The computer data signal of claim 11 further comprising program code for generating the annotated structured data file prior to beginning the first merge session.
13. The computer data signal of claim 12 wherein the program code for generating the annotated structured data file comprises:
program code for executing a difference generator on a baseline structured data file, a first contributor structured data file, and a second contributor structured data file to generate a delta table and a conflict table;
program code for copying the baseline structured data file; and
program code for annotating the copy of the baseline structured data file to include each entry of the delta table and the conflict table.
14. The computer data signal of claim 11 further comprising program code for transferring the incomplete merge file to the second user over a network.
15. The computer data signal of claim 14 further comprising program code for beginning a second merge session by accessing the incomplete merge file and reviewing, by a second user, at least one annotation within the incomplete merge file.
16. An apparatus for merging changes made to a baseline structured data file, the computer data signal comprising:
means for accessing an annotated structured data file to begin a first merge session;
means for reviewing, by a first user, at least one annotation within the annotated data file;
means for saving the annotated data file to create an incomplete merge file; and
means for closing the first merge session in response to the first user indicating the end the first merge session.
17. The apparatus of claim 16 further comprising means for generating the annotated structured data file prior to beginning the first merge session.
18. The apparatus of claim 17 wherein the means for generating the annotated structured data file comprises:
means for determining differences between a baseline structured data file, a first contributor structured data file, and a second contributor structured data file to generate a delta table and a conflict table;
means for copying the baseline structured data file; and
means for annotating the copy of the baseline structured data file to include each entry of the delta table and the conflict table.
19. The apparatus of claim 16 further comprising means for transferring the incomplete merge file to the second user over a network.
20. The apparatus of claim 19 further comprising means for accessing the incomplete merge file and reviewing at least one annotation within the incomplete merge file, by a second user, to begin a second merge session.
21. A computer readable medium comprising instructions configured to cause a computer to generate a portable annotated data structure comprising a baseline data structure and at least one delta associated with a portion of the baseline data structure.
The claims below are in addition to those above.
All refrences to claim(s) which appear below refer to the numbering after this setence.
1. A system for reduction of electricity usage in an electricity supply network, the system including a computer configured to:
a. create a data link to an external remote management center, wherein the remote management center includes a demand response controller;
b. receive a demand response event request from the demand response controller;
c. upon receipt of the demand response event request, command the computer to enter a low energy power use state.
2. The system of claim 1 further configured to:
a. monitor an activity level of the computer to determine whether the computer is in an active use mode;
b. upon determining that the computer is not in the active use mode for a time period exceeding a threshold time period, activate a user interface allowing a user to provide a user indication that the computer should not be placed in a low energy use power state;
c. upon receipt of the demand response event request, activate the user interface allowing the user to provide the user indication indicating that the computer should not be placed in the low energy use power state;
d. where such user indication is not provided by the user, command the computer to enter the low energy power use state.
3. The system of claim 2 further configured to command the computer to enter a reduced energy use power use state when such user indication that the computer should not be placed in a low energy use power state is provided.
4. The system of claim 2 further configured to activate the user interface following the demand response request only when the computer is determined to be outside the active use mode.
5. The system of claim 2 further configured to communicate the user indication to the demand response controller, whereby the demand response controller can determine that the computer will not be placed in the low energy use power state.
6. The system of claim 1 further configured to:
a. receive, from an energy saving device monitoring power drawn by the computer, power usage data describing the power usage of the computer, and
b. communicate the power usage data to the remote management center.
7. The system of claim 1 further configured to:
a. receive, from an energy saving device:
(1) monitoring power drawn by the computer, and
(2) controlling power supply to at least one peripheral of the computer, an indication that the energy saving device is installed, and
b. communicate the indication to the remote management center.
8. A method for reducing electricity usage in an electricity supply network, wherein a computer is supplied with electricity by the electricity supply network, the method including the steps of:
a. creating a data link to an external demand response controller configured to issue a demand response event request;
b. the computer receiving from the demand response controller a demand response event request;
c. following receipt of the demand response event request, the computer activating a user interface allowing a user to provide a user indication indicating that the computer should not be placed in a low energy use power state;
d. where such user indication is not provided by the user, commanding the computer to enter the low energy power use state.
9. The method of claim 8 further including the steps of:
a. monitoring an activity level of the computer to determine whether the computer is in an active use mode,
b. upon determining that the computer is not in the active use mode for a time period exceeding a threshold time period, activating a user interface allowing a user to provide a user indication that the computer should not be placed in a low energy use power state;
c. where such user indication is not provided, commanding the computer to enter a low energy power use state.
10. The method of claim 8 further including the step of supplying an energy saving device to a customer of the electricity supply network, the energy saving device including:
a. an electrical inlet configured to connect to a general power outlet,
b. a monitored electrical outlet configured to connect to, and to supply electrical power to, the computer,
c. a peripherals electrical outlet configured to connect to, and to supply electrical power to, a peripheral device,
d. a switch configured to control electrical connection of the electrical inlet to the peripherals electrical outlet, and thus to control supply of electric power to the peripheral device,
e. a sensor configured to sense at least one characteristic of electrical power supplied through the monitored electrical outlet to the computer,
wherein the switch is configured to remove power from the peripherals electrical outlet when the sensor detects that the computer has entered a low energy power use state.
11. The method of claim 10 wherein the energy saving device is supplied to the customer of the electricity supply network after the customer indicates agreement to have the computer receive the demand response event request.
12. A system for reduction of electricity usage in an electricity supply network, the system including a software control module configured to:
a. monitor an activity level of the computer to determine whether the computer is in an active use mode;
b. upon determining that the computer is not in the active use mode for a time period exceeding a threshold time period, activate a user interface allowing a user to provide a user indication that the computer should not be placed in a low energy use power state;
c. cause the computer to create a data link to an external demand response controller;
d. receive from the demand response controller a demand response event request;
e. following receipt of the demand response event request, activate the user interface allowing a user to provide a user indication indicating that the computer should not be placed in a low energy use power state;
f. where such user indication is not provided, command the computer to enter a low energy power use state.
13. The system of claim 12 further including an energy saving device having:
a. an electrical inlet configured to connect to a general power outlet,
b. at least one monitored electrical outlet configured to connect to, and to supply electrical power to, the computer,
c. at least one peripherals electrical outlet configured to connect to, and to supply electrical power to, a peripheral device,
d. a switch configured to control electrical connection of the electrical inlet to the peripherals electrical outlet, and thus to control supply of electric power to the peripheral device,
e. a sensor configured to sense at least one characteristic of electrical power supplied through the monitored electrical outlet to the computer,
wherein the switch is configured to remove power from the peripherals electrical outlet when the sensor detects that the computer has entered a low energy power use state.
14. The system of claim 13 wherein the switch is configured to remove power from the switched electrical outlet when the sensor detects that the computer has entered a low energy power use state.
15. A method for reduction of electricity usage in an electricity supply network, wherein the network supplies electricity to several computers, the method including the steps of:
a. receiving information from software control modules, each software control module running on one of the computers, the information indicating that the computers are available to participate in a demand response event;
b. receiving a demand reduction request from an energy supply utility associated with the electricity supply network, the demand reduction request being a request to reduce electricity consumption by devices supplied with electricity by the network;
c. issuing a demand response event request to the software control modules, the demand response event request causing each software control module to activate a user interface allowing a user to provide a user indication indicating that the computer should not be placed in a low energy use power state;
d. where such user indication is not provided, the software module commanding the computer to enter a low energy power use state.
16. The method of claim 15 further including the step of the software module commanding the computer to enter a reduced energy use power use state when the user indication is provided.